[hibernate3] disable infinispan module, switch to xmvn
gil
gil at fedoraproject.org
Tue Jun 17 07:07:38 UTC 2014
commit e79bff06cbc8a3c6c54630ff6e632747121e0b0b
Author: gil <puntogil at libero.it>
Date: Tue Jun 17 09:07:26 2014 +0200
disable infinispan module, switch to xmvn
hibernate3.spec | 186 +++++++++----------------------------------------------
1 files changed, 30 insertions(+), 156 deletions(-)
---
diff --git a/hibernate3.spec b/hibernate3.spec
index 5d47151..061eb1f 100644
--- a/hibernate3.spec
+++ b/hibernate3.spec
@@ -41,7 +41,8 @@ BuildRequires: jboss-servlet-3.0-api
BuildRequires: ehcache-core
BuildRequires: jbosscache-core
BuildRequires: jbosscache-common-parent
-BuildRequires: infinispan
+# H3 dont support infinispan > 5.3.0
+# BuildRequires: infinispan
BuildRequires: rhq-plugin-annotations
BuildRequires: h2
%if %{fedora} > 19
@@ -53,15 +54,7 @@ BuildRequires: mvn(org.slf4j:slf4j-log4j12)
BuildRequires: glassfish-jaxb
BuildRequires: shrinkwrap
-Requires: jpackage-utils
-Requires: javapackages-tools >= 0.7.2
-Requires: apache-commons-collections
-Requires: dom4j
-Requires: geronimo-validation
-Requires: hibernate-commons-annotations
-Requires: hibernate-jpa-2.0-api
-Requires: jboss-servlet-3.0-api
-Requires: geronimo-jta
+Obsoletes: %{name}-infinispan < %{version}-%{release}
%description
Hibernate is a powerful, ultra-high performance
@@ -76,67 +69,42 @@ API documentation for %{name}.
%package entitymanager
Summary: Hibernate Entity Manager
-Requires: cglib
-Requires: %{name} = %{version}-%{release}
-Requires: hibernate-jpa-2.0-api
-Requires: hibernate-validator
-Requires: javassist
%description entitymanager
%{summary}.
%package envers
Summary: Hibernate support for entity auditing
-Requires: hibernate-commons-annotations
-Requires: hibernate-jpa-2.0-api
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-entitymanager = %{version}-%{release}
%description envers
%{summary}.
%package c3p0
Summary: C3P0-based implementation of Hibernate ConnectionProvider
-Requires: %{name} = %{version}-%{release}
-Requires: c3p0
%description c3p0
%{summary}.
%package proxool
Summary: Proxool-based implementation of Hibernate ConnectionProvder
-Requires: %{name} = %{version}-%{release}
%description proxool
%{summary}.
%package ehcache
Summary: Integration of Hibernate with Ehcache
-Requires: %{name} = %{version}-%{release}
-Requires: ehcache-core
%description ehcache
%{summary}.
%package jbosscache
Summary: Integration of hibernate with jbosscache
-Requires: %{name} = %{version}-%{release}
-Requires: jbosscache-core
%description jbosscache
%{summary}.
-%package infinispan
-Summary: Integration of Hibernate with Infinispan
-Requires: infinispan
-
-%description infinispan
-%{summary}.
-
%package testing
Summary: Hibernate JUnit test utilities
-Requires: %{name} = %{version}-%{release}
-Requires: junit
%description testing
%{summary}.
@@ -146,7 +114,7 @@ Requires: junit
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%%patch3 -p1
%patch4 -p1
%pom_remove_plugin org.jboss.maven.plugins:maven-jdocbook-plugin hibernate-parent
@@ -158,6 +126,8 @@ Requires: junit
%pom_disable_module hibernate-jdbc3-testing
%pom_disable_module hibernate-jdbc4-testing
+%pom_disable_module hibernate-infinispan
+
# Remove test deps
for m in envers infinispan entitymanager jbosscache ehcache; do
%pom_xpath_remove "pom:dependencies/pom:dependency[pom:scope = 'test']" hibernate-${m}/pom.xml
@@ -173,7 +143,7 @@ rm -r hibernate-envers/src/main/java/org/hibernate/tool/ant/*.java \
hibernate-envers/src/main/java/org/hibernate/envers/ant/*.java
# Make hibernate-testing back a test dependency...
-sed -i "s|<!-- <scope>test</scope> TODO fix this -->|<scope>test</scope>|" hibernate-infinispan/pom.xml
+#sed -i "s|<!-- <scope>test</scope> TODO fix this -->|<scope>test</scope>|" hibernate-infinispan/pom.xml
# Fix the c3p0 gid
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'c3p0' ]/pom:groupId" com.mchange hibernate-c3p0
@@ -192,145 +162,49 @@ done
sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1307,02110-1301," lgpl.txt
+%mvn_compat_version : "%{majorversion},%{namedversion}"
+%mvn_package ":hibernate-parent" %{name}
+%mvn_package ":hibernate-core" %{name}
+%mvn_package ":hibernate" __noinstall
+
%build
# Currently 4 tests fail with this error:
# "Unable to get the default Bean Validation factory"
export jdk16_home=/usr
export LANG=en_US.UTF-8
-mvn-rpmbuild \
- -Dmaven.local.depmap.file=%{SOURCE1} \
- -DdisableDistribution=true \
- -Dmaven.test.skip=true \
- package \
- javadoc:aggregate
-
+%mvn_build -f -- -Dmaven.local.depmap.file=%{SOURCE1} -DdisableDistribution=true
%install
+%mvn_install
-# POM files:
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-install -pm 644 hibernate-parent/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
-
-%add_maven_depmap JPP-%{name}-parent.pom -v "%{majorversion},%{namedversion}"
-
-# Jar files:
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-
-install -m 644 hibernate-core/target/hibernate-core-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/hibernate-core.jar
-install -pm 644 hibernate-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-core.pom
-
-%add_maven_depmap JPP.%{name}-hibernate-core.pom %{name}/hibernate-core.jar -v "%{majorversion},%{namedversion}"
-
-for module in c3p0 ehcache infinispan jbosscache proxool \
- entitymanager envers testing; do
- install -m 644 hibernate-${module}/target/hibernate-${module}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/hibernate-${module}.jar
- install -pm 644 hibernate-${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-${module}.pom
-%add_maven_depmap JPP.%{name}-hibernate-${module}.pom %{name}/hibernate-${module}.jar -f ${module} -v "%{majorversion},%{namedversion}"
-done
-
-# Javadoc files:
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles-%{name}
%doc changelog.txt lgpl.txt
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/hibernate-core-%{version}.jar
-%{_javadir}/%{name}/hibernate-core-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-core-%{namedversion}.jar
-%{_mavenpomdir}/JPP-%{name}-parent-%{version}.pom
-%{_mavenpomdir}/JPP-%{name}-parent-%{majorversion}.pom
-%{_mavenpomdir}/JPP-%{name}-parent-%{namedversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-core-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-core-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-core-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%doc lgpl.txt
-%{_javadocdir}/%{name}
-%files entitymanager
+%files javadoc -f .mfiles-javadoc
%doc lgpl.txt
-%{_javadir}/%{name}/hibernate-entitymanager-%{version}.jar
-%{_javadir}/%{name}/hibernate-entitymanager-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-entitymanager-%{namedversion}.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-entitymanager-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-entitymanager-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-entitymanager-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}-entitymanager
-
-%files envers
+
+%files entitymanager -f .mfiles-entitymanager
%doc lgpl.txt
-%{_javadir}/%{name}/hibernate-envers-%{version}.jar
-%{_javadir}/%{name}/hibernate-envers-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-envers-%{namedversion}.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-envers-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-envers-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-envers-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}-envers
-
-%files c3p0
+
+%files envers -f .mfiles-envers
%doc lgpl.txt
-%{_javadir}/%{name}/hibernate-c3p0-%{version}.jar
-%{_javadir}/%{name}/hibernate-c3p0-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-c3p0-%{namedversion}.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-c3p0-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-c3p0-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-c3p0-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}-c3p0
-
-%files ehcache
+
+%files c3p0 -f .mfiles-c3p0
%doc lgpl.txt
-%{_javadir}/%{name}/hibernate-ehcache-%{version}.jar
-%{_javadir}/%{name}/hibernate-ehcache-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-ehcache-%{namedversion}.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-ehcache-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-ehcache-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-ehcache-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}-ehcache
-
-%files infinispan
+
+%files ehcache -f .mfiles-ehcache
%doc lgpl.txt
-%{_javadir}/%{name}/hibernate-infinispan-%{version}.jar
-%{_javadir}/%{name}/hibernate-infinispan-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-infinispan-%{namedversion}.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-infinispan-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-infinispan-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-infinispan-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}-infinispan
-
-%files proxool
+
+%files proxool -f .mfiles-proxool
%doc lgpl.txt
-%{_javadir}/%{name}/hibernate-proxool-%{version}.jar
-%{_javadir}/%{name}/hibernate-proxool-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-proxool-%{namedversion}.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-proxool-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-proxool-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-proxool-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}-proxool
-
-%files jbosscache
+
+%files jbosscache -f .mfiles-jbosscache
%doc lgpl.txt
-%{_javadir}/%{name}/hibernate-jbosscache-%{version}.jar
-%{_javadir}/%{name}/hibernate-jbosscache-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-jbosscache-%{namedversion}.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-jbosscache-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-jbosscache-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-jbosscache-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}-jbosscache
-
-%files testing
+
+%files testing -f .mfiles-testing
%doc lgpl.txt
-%{_javadir}/%{name}/hibernate-testing-%{version}.jar
-%{_javadir}/%{name}/hibernate-testing-%{majorversion}.jar
-%{_javadir}/%{name}/hibernate-testing-%{namedversion}.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-testing-%{version}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-testing-%{majorversion}.pom
-%{_mavenpomdir}/JPP.%{name}-hibernate-testing-%{namedversion}.pom
-%{_mavendepmapfragdir}/%{name}-testing
%changelog
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.10-14
More information about the scm-commits
mailing list