[ehcache-core] Add support for new Maven compat version resolver (hibernate3)

[Marek Goldmann]

commit 099c102c3d3c30d1fda71869d418fa5ac904e5f5
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Wed Nov 7 11:52:41 2012 +0100

    Add support for new Maven compat version resolver (hibernate3)

 ehcache-core.spec |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/ehcache-core.spec b/ehcache-core.spec
index cf10773..8f5b783 100644
--- a/ehcache-core.spec
+++ b/ehcache-core.spec
@@ -1,6 +1,6 @@
 Name:          ehcache-core
 Version:       2.6.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Easy Hibernate Cache
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -30,7 +30,7 @@ BuildRequires: java-devel
 BuildRequires: jpackage-utils
 
 BuildRequires: geronimo-jta
-BuildRequires: hibernate3
+BuildRequires: hibernate3 >= 3.6.10-7
 BuildRequires: ehcache-sizeof-agent
 BuildRequires: slf4j
 BuildRequires: tomcat-servlet-3.0-api
@@ -64,7 +64,7 @@ BuildRequires: plexus-resources
 
 Requires:      ehcache-sizeof-agent
 Requires:      geronimo-jta
-Requires:      hibernate3
+Requires:      hibernate3 >= 3.6.10-7
 Requires:      slf4j
 Requires:      tomcat-servlet-3.0-api
 
@@ -89,10 +89,13 @@ This package contains javadoc for %{name}.
 %patch1 -p0
 %patch2 -p0
 
+# Make sure we require version '3' of Hibernate
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']/pom:version"
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']" "<version>3</version>"
 %build
 
 # tests skipped. cause: missing dependencies
-mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" -Dmaven.test.skip=true install javadoc:aggregate
+mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" -Dmaven.test.skip=true install javadoc:aggregate
 
 %install
 
@@ -117,6 +120,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc src/assemble/EHCACHE-CORE-LICENSE.txt
 
 %changelog
+* Wed Nov 07 2012 Marek Goldmann <mgoldman at redhat.com> - 2.6.0-3
+- Add support for new Maven compat version resolver (hibernate3)
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -127,4 +133,4 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 - update to 2.5.2
 
 * Mon Mar 12 2012 Andy Grimm <agrimm at gmail.com> - 2.5.1-1
-- Initial packaging
\ No newline at end of file
+- Initial packaging