commit 8150a9f675f99dd7954dde072e37dd819a4b63ef Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Mon Nov 11 10:51:53 2013 +0100

Expand variables in manifest properly (#1028931)

hibernate.spec | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) --- diff --git a/hibernate.spec b/hibernate.spec index 327b326..ae5ed40 100644 --- a/hibernate.spec +++ b/hibernate.spec @@ -3,7 +3,7 @@

Name: hibernate Version: 4.3.0 -Release: 0.2%{namedreltag}%{?dist} +Release: 0.3%{namedreltag}%{?dist} Summary: Relational persistence and query service Group: Development/Libraries License: LGPLv2+ and ASL 2.0 @@ -283,7 +283,7 @@ popd

#osgi maven-plugin for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do -%pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-${m} ' +%pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-${m} " <extensions>true</extensions> <configuration> <instructions> @@ -291,7 +291,7 @@ for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do <Bundle-SymbolicName>org.hibernate.${m}</Bundle-SymbolicName> <Bundle-Name>hibernate-${m}</Bundle-Name> <Bundle-Vendor>Hibernate.org</Bundle-Vendor> - <Bundle-Version>${project.version}</Bundle-Version> + <Bundle-Version>${project.version}</Bundle-Version> </instructions> </configuration> <executions> @@ -302,12 +302,12 @@ for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do <goal>manifest</goal> </goals> </execution> -</executions>' +</executions>"

-%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin hibernate-${m} ' +%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin hibernate-${m} " <configuration> <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifest> <addClasspath>false</addClasspath> <mainClass>org.hibernate.Version</mainClass> @@ -316,10 +316,10 @@ for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do <Implementation-Url>http://hibernate.org</Implementation-Url> <Implementation-Vendor>Hibernate.org</Implementation-Vendor> <Implementation-Vendor-Id>org.hibernate</Implementation-Vendor-Id> - <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Version>${project.version}</Implementation-Version> </manifestEntries> </archive> -</configuration>' +</configuration>"

done

@@ -384,6 +384,9 @@ sed -i "s|org.infinispan.util.FileLookupFactory|org.infinispan.commons.util.File %doc lgpl.txt LICENSE-2.0.txt

%changelog +* Mon Nov 11 2013 Stanislav Ochotnicky sochotnicky@redhat.com - 4.3.0-0.3.Beta4 +- Expand variables in manifest properly (#1028931) + * Fri Nov 08 2013 Marek Goldmann mgoldman@redhat.com - 4.3.0-0.2.Beta4 - Added osgi and maven-plugin modules - Added OSGi manifests to files