[hibernate3] rebuilt with new hibernate-commons-annotations

gil gil at fedoraproject.org
Sat Sep 14 14:26:40 UTC 2013 

commit a1cab17f10ae1833ed12041e3aefe472aa553e17
Author: gil <puntogil at libero.it>
Date:   Sat Sep 14 16:26:17 2013 +0200

    rebuilt with new hibernate-commons-annotations

 hibernate3.spec |   60 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 39 insertions(+), 21 deletions(-)
---
diff --git a/hibernate3.spec b/hibernate3.spec
index a832dab..509ba88 100644
--- a/hibernate3.spec
+++ b/hibernate3.spec
@@ -3,21 +3,16 @@
 %global majorversion 3
 %global oname hibernate-orm
 
-Name: hibernate3
+Name:    hibernate3
 Version: 3.6.10
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Relational persistence and query service
-
-Group: Development/Libraries
 License: LGPLv2+
-
-URL: http://www.hibernate.org/
-
+URL:     http://www.hibernate.org/
 # git clone git://github.com/hibernate/hibernate-orm
 # cd hibernate-orm/ && git archive --format=tar --prefix=hibernate-orm-3.6.10.Final/ 3.6.10.Final | xz > hibernate-3.6.10.Final.tar.xz
 Source0: hibernate-orm-3.6.10.Final.tar.xz
 Source1: hibernate3-depmap
-
 Patch0:  hibernate-orm-fix-cglib-gid.patch
 Patch1:  hibernate-orm-fix-jacc-gid-aid.patch
 Patch2:  hibernate-orm-fix-ant-gid.patch
@@ -29,18 +24,12 @@ BuildRequires: jpackage-utils
 BuildRequires: javapackages-tools >= 0.7.2
 BuildRequires: java-devel
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-release-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
 BuildRequires: maven-enforcer-plugin
-BuildRequires: geronimo-validation
-BuildRequires: geronimo-jta
 BuildRequires: maven-injection-plugin
 BuildRequires: antlr-maven-plugin
+BuildRequires: geronimo-validation
+BuildRequires: geronimo-jta
 BuildRequires: hibernate-validator
 BuildRequires: cglib
 BuildRequires: jboss-jacc-1.4-api
@@ -54,7 +43,11 @@ BuildRequires: jbosscache-common-parent
 BuildRequires: infinispan
 BuildRequires: rhq-plugin-annotations
 BuildRequires: h2
-BuildRequires: hsqldb1
+%if %{fedora} > 19
+BuildRequires: mvn(hsqldb:hsqldb:1)
+%else
+BuildRequires: mvn(hsqldb:hsqldb)
+%endif
 BuildRequires: glassfish-jaxb
 BuildRequires: shrinkwrap
 
@@ -76,8 +69,6 @@ for Java.
 
 %package javadoc
 Summary: API docs for %{name}
-Group: Documentation
-Requires: jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -158,6 +149,7 @@ Requires: junit
 
 %pom_remove_plugin org.jboss.maven.plugins:maven-jdocbook-plugin hibernate-parent
 %pom_remove_plugin org.jboss.maven.plugins:maven-jdocbook-style-plugin hibernate-parent
+%pom_remove_plugin :gmaven-plugin hibernate-parent
 %pom_disable_module hibernate-testsuite
 %pom_disable_module hibernate-oscache
 %pom_disable_module hibernate-swarmcache
@@ -182,7 +174,21 @@ rm -r hibernate-envers/src/main/java/org/hibernate/tool/ant/*.java \
 sed -i "s|<!-- <scope>test</scope> TODO fix this -->|<scope>test</scope>|" hibernate-infinispan/pom.xml
 
 # Fix the c3p0 gid
-sed -i "s|groupId>c3p0</groupId|groupId>com.mchange</groupId|" hibernate-c3p0/pom.xml
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'c3p0' ]/pom:groupId" com.mchange  hibernate-c3p0
+
+# Fix the hibernate-commons-annotations gid
+for f in hibernate-core hibernate-envers;do
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'hibernate-commons-annotations' ]/pom:groupId" org.hibernate.common  ${f}
+done
+
+for f in hibernate-core hibernate-entitymanager hibernate-parent;do
+sed -i "s|<groupId>javax.validation|<groupId>org.apache.geronimo.specs|" ${f}/pom.xml
+sed -i "s|<artifactId>validation-api|<artifactId>geronimo-validation_1.0_spec|" ${f}/pom.xml
+done
+
+%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId = 'hibernate-commons-annotations' ]/pom:groupId" org.hibernate.common  hibernate-parent
+
+sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1307,02110-1301," lgpl.txt
 
 %build
 
@@ -194,7 +200,7 @@ mvn-rpmbuild \
   -Dmaven.local.depmap.file=%{SOURCE1} \
   -DdisableDistribution=true \
   -Dmaven.test.skip=true \
-  install \
+  package \
   javadoc:aggregate
 
 
@@ -245,6 +251,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %files entitymanager
+%doc lgpl.txt
 %{_javadir}/%{name}/hibernate-entitymanager-%{version}.jar
 %{_javadir}/%{name}/hibernate-entitymanager-%{majorversion}.jar
 %{_javadir}/%{name}/hibernate-entitymanager-%{namedversion}.jar
@@ -254,6 +261,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-entitymanager
 
 %files envers
+%doc lgpl.txt
 %{_javadir}/%{name}/hibernate-envers-%{version}.jar
 %{_javadir}/%{name}/hibernate-envers-%{majorversion}.jar
 %{_javadir}/%{name}/hibernate-envers-%{namedversion}.jar
@@ -263,6 +271,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-envers
 
 %files c3p0
+%doc lgpl.txt
 %{_javadir}/%{name}/hibernate-c3p0-%{version}.jar
 %{_javadir}/%{name}/hibernate-c3p0-%{majorversion}.jar
 %{_javadir}/%{name}/hibernate-c3p0-%{namedversion}.jar
@@ -272,6 +281,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-c3p0
 
 %files ehcache
+%doc lgpl.txt
 %{_javadir}/%{name}/hibernate-ehcache-%{version}.jar
 %{_javadir}/%{name}/hibernate-ehcache-%{majorversion}.jar
 %{_javadir}/%{name}/hibernate-ehcache-%{namedversion}.jar
@@ -281,6 +291,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-ehcache
 
 %files infinispan
+%doc lgpl.txt
 %{_javadir}/%{name}/hibernate-infinispan-%{version}.jar
 %{_javadir}/%{name}/hibernate-infinispan-%{majorversion}.jar
 %{_javadir}/%{name}/hibernate-infinispan-%{namedversion}.jar
@@ -290,6 +301,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-infinispan
 
 %files proxool
+%doc lgpl.txt
 %{_javadir}/%{name}/hibernate-proxool-%{version}.jar
 %{_javadir}/%{name}/hibernate-proxool-%{majorversion}.jar
 %{_javadir}/%{name}/hibernate-proxool-%{namedversion}.jar
@@ -299,6 +311,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-proxool
 
 %files jbosscache
+%doc lgpl.txt
 %{_javadir}/%{name}/hibernate-jbosscache-%{version}.jar
 %{_javadir}/%{name}/hibernate-jbosscache-%{majorversion}.jar
 %{_javadir}/%{name}/hibernate-jbosscache-%{namedversion}.jar
@@ -308,6 +321,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-jbosscache
 
 %files testing
+%doc lgpl.txt
 %{_javadir}/%{name}/hibernate-testing-%{version}.jar
 %{_javadir}/%{name}/hibernate-testing-%{majorversion}.jar
 %{_javadir}/%{name}/hibernate-testing-%{namedversion}.jar
@@ -317,6 +331,10 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-testing
 
 %changelog
+* Sat Sep 14 2013 gil cattaneo <puntogil at libero.it> 3.6.10-12
+- rebuilt with new hibernate-commons-annotations
+- fix validation-api gId:aId
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.10-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

More information about the scm-commits mailing list