[springframework] Don't depend on backport-util-concurrent

Juan Hernandez jhernand at fedoraproject.org
Wed Jan 9 10:08:49 UTC 2013


commit ffa2e52f9ce427dbe94f79c693264b1eef69ed7f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Jan 8 20:32:41 2013 +0100

    Don't depend on backport-util-concurrent

 springframework.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/springframework.spec b/springframework.spec
index 501ed54..b315b99 100644
--- a/springframework.spec
+++ b/springframework.spec
@@ -1,7 +1,7 @@
 Name: springframework
 Summary: Spring Java Application Framework
 Version: 3.1.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 0
 License: ASL 2.0
 Group: Development/Libraries
@@ -94,7 +94,6 @@ BuildRequires: apache-commons-collections
 BuildRequires: apache-commons-logging
 BuildRequires: aspectjweaver
 BuildRequires: atinject
-BuildRequires: backport-util-concurrent
 BuildRequires: bsh
 BuildRequires: c3p0
 BuildRequires: cglib
@@ -105,6 +104,7 @@ BuildRequires: geronimo-ejb
 BuildRequires: geronimo-interceptor
 BuildRequires: geronimo-jpa
 BuildRequires: geronimo-jta
+BuildRequires: geronimo-parent-poms
 BuildRequires: geronimo-validation
 BuildRequires: groovy
 BuildRequires: h2
@@ -243,7 +243,6 @@ Requires: %{name}-expression = %{version}-%{release}
 Requires: %{name}-instrument = %{version}-%{release}
 Requires: aspectjweaver
 Requires: atinject
-Requires: backport-util-concurrent
 Requires: bsh
 Requires: cglib
 Requires: geronimo-annotation
@@ -576,6 +575,10 @@ org.springframework.integration-tests/pom.xml
 org.springframework.orm/pom.xml
 EOF
 
+# Don't depend on backport-util-concurrent
+%pom_remove_dep :backport-util-concurrent org.springframework.context
+sed -i s/edu.emory.mathcs.backport.// `find org.springframework.context -name *.java`
+
 %build
 
 # Build without the tests, as they bring a lot of dependecies that are not
@@ -736,6 +739,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
 
 
 %changelog
+* Tue Jan  8 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:3.1.1-12
+- Don't depend on backport-util-concurrent
+
 * Wed Nov 07 2012 Marek Goldmann <mgoldman at redhat.com> - 0:3.1.1-11
 - Add support for new Maven compat version resolver (hibernate3)
 


More information about the scm-commits mailing list