Attachment 675031 Details for Bug 875165 – Proposed patch

[patch] Proposed patch

0001-Don-t-depend-on-backport-util-concurrent.patch (text/plain), 1.89 KB, created by Mikolaj Izdebski on 2013-01-08 19:46:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2013-01-08 19:46:28 UTC

Size: 1.89 KB

patch

obsolete

>From 8c2d399007ccd32d7b22eee6fbe62d1d8e8d9b91 Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Tue, 8 Jan 2013 20:32:41 +0100
>Subject: [PATCH] Don't depend on backport-util-concurrent
>
>---
> springframework.spec | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
>diff --git a/springframework.spec b/springframework.spec
>index 501ed54..4994b09 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
>@@ -243,7 +242,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 +574,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 +738,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
> 
> 
> %changelog
>+* Tue Jan  8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:3.1.1-12
>+- Don't depend on backport-util-concurrent
>+
> * Wed Nov 07 2012 Marek Goldmann <mgoldman@redhat.com> - 0:3.1.1-11
> - Add support for new Maven compat version resolver (hibernate3)
> 
>-- 
>1.8.0.1
>

Actions: View | Diff

Attachments on bug 875165: 675031