[hibernate3/f17] Enabled ehcache module and split modules into subpackages

[Andy Grimm]

commit 4cbe0043fe9c65c6b34617e5d30076bc071daa1c
Author: Andy Grimm <agrimm at gmail.com>
Date:   Mon Aug 6 11:18:30 2012 -0400

    Enabled ehcache module and split modules into subpackages

 hibernate-orm-disable-jdocbook.patch |   71 ------------------------
 hibernate-orm-omit-modules.patch     |   19 ------
 hibernate3.spec                      |  101 ++++++++++++++++++++++++++++-----
 3 files changed, 85 insertions(+), 106 deletions(-)
---
diff --git a/hibernate3.spec b/hibernate3.spec
index c12debd..c6abfde 100644
--- a/hibernate3.spec
+++ b/hibernate3.spec
@@ -1,10 +1,11 @@
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
+# offical name
 %global oname hibernate-orm
 
 Name: hibernate3
 Version: 3.6.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Relational persistence and query service
 
 Group: Development/Libraries
@@ -16,11 +17,9 @@ URL: http://www.hibernate.org/
 # 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
 
-Patch0:  hibernate-orm-disable-jdocbook.patch
-Patch1:  hibernate-orm-fix-cglib-gid.patch
-Patch2:  hibernate-orm-fix-jacc-gid-aid.patch
-Patch3:  hibernate-orm-fix-ant-gid.patch
-Patch4:  hibernate-orm-omit-modules.patch
+Patch0:  hibernate-orm-fix-cglib-gid.patch
+Patch1:  hibernate-orm-fix-jacc-gid-aid.patch
+Patch2:  hibernate-orm-fix-ant-gid.patch
 
 BuildArch: noarch
 
@@ -45,13 +44,19 @@ BuildRequires: c3p0
 BuildRequires: proxool
 BuildRequires: hibernate-commons-annotations
 BuildRequires: jboss-servlet-3.0-api
+BuildRequires: ehcache-core
+# Uncomment when BZ 844827 is done
+# BuildRequires: jbosscache-core
+# FIXME: Infinispan module build is failing
+# BuildRequires: infinispan
 
-Requires: hibernate-jpa-2.0-api
+Requires: java
 Requires: jpackage-utils
+Requires: apache-commons-collections
+Requires: dom4j
 Requires: geronimo-validation
-Requires: hibernate-validator
-Requires: java
 Requires: hibernate-commons-annotations
+Requires: hibernate-jpa-2.0-api
 Requires: jboss-servlet-3.0-api
 
 %description
@@ -64,17 +69,59 @@ Summary: API docs for %{name}
 Group: Documentation
 Requires: jpackage-utils
 
-
 %description javadoc
 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 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: ehcache-core
+
+%description ehcache
+%{summary}.
+
 %prep
 %setup -q -n %{oname}-%{namedversion}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+%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_disable_module hibernate-testsuite
+%pom_disable_module hibernate-oscache
+%pom_disable_module hibernate-swarmcache
+%pom_disable_module hibernate-envers
+%pom_disable_module hibernate-jdbc3-testing
+# infinispan module doesn't build yet.
+%pom_disable_module hibernate-infinispan
+# Remove when BZ 844827 is done
+%pom_disable_module hibernate-jbosscache
 
 %build
 
@@ -97,7 +144,8 @@ install -pm 644 hibernate-parent/pom.xml  %{buildroot}%{_mavenpomdir}/JPP-%{name
 
 # Jar files:
 install -d -m 755 %{buildroot}%{_javadir}/%{name}
-for module in hibernate-core hibernate-c3p0 hibernate-proxool hibernate-entitymanager; do
+for module in hibernate-core hibernate-c3p0 hibernate-proxool \
+              hibernate-entitymanager hibernate-ehcache ; do
     install -m 644 ${module}/target/${module}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/${module}.jar
     install -pm 644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${module}.pom
 %add_maven_depmap JPP.%{name}-${module}.pom %{name}/${module}.jar
@@ -109,16 +157,37 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %doc changelog.txt lgpl.txt
-%{_mavenpomdir}/*
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/hibernate-core.jar
+%{_mavenpomdir}/JPP-%{name}-parent.pom
+%{_mavenpomdir}/JPP.%{name}-hibernate-core.pom
 %{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}
-
 
 %files javadoc
 %doc lgpl.txt
 %{_javadocdir}/%{name}
 
+%files entitymanager
+%{_javadir}/%{name}/hibernate-entitymanager.jar
+%{_mavenpomdir}/JPP.%{name}-hibernate-entitymanager.pom
+
+%files c3p0
+%{_javadir}/%{name}/hibernate-c3p0.jar
+%{_mavenpomdir}/JPP.%{name}-hibernate-c3p0.pom
+
+%files ehcache
+%{_javadir}/%{name}/hibernate-ehcache.jar
+%{_mavenpomdir}/JPP.%{name}-hibernate-ehcache.pom
+
+%files proxool
+%{_javadir}/%{name}/hibernate-proxool.jar
+%{_mavenpomdir}/JPP.%{name}-hibernate-proxool.pom
 
 %changelog
+* Mon Aug 06 2012 Andy Grimm <agrimm at gmail.com> - 3.6.10-2
+- Enable ehcache module (#845209)
+- Use pom macros for module disablement
+- Split into subpackages
+
 * Wed Mar 14 2012 Andy Grimm <agrimm at gmail.com> - 3.6.10-1
 - Initial package