[apache-ivy] Drop workaround for broken apache-ivy

Michal Srb msrb at fedoraproject.org
Thu Jun 26 05:28:48 UTC 2014


commit f51b17edadc668615136c5f246c494a7cdcc2489
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Jun 26 07:01:38 2014 +0200

    Drop workaround for broken apache-ivy

 apache-ivy.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-ivy.spec b/apache-ivy.spec
index 77cae13..c6db573 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,6 +1,6 @@
 Name:           apache-ivy
 Version:        2.3.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Java-based dependency manager
 
 License:        ASL 2.0
@@ -72,7 +72,7 @@ rm -rf doc build/doc
 sed -i /ivy:publish/s/local/xmvn/ build.xml
 
 %build
-CLASSPATH=`build-classpath apache-ivy/ivy` ant -Divy.mode=local -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundle.version.qualifier= -Dtarget.ivy.version=%{version} jar javadoc publish-local
+%ant -Divy.mode=local -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundle.version.qualifier= -Dtarget.ivy.version=%{version} jar javadoc publish-local
 
 
 %install
@@ -89,6 +89,9 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Jun 26 2014 Michal Srb <msrb at redhat.com> - 2.3.0-15
+- Drop workaround for broken apache-ivy
+
 * Thu Jun 26 2014 Michal Srb <msrb at redhat.com> - 2.3.0-14
 - Fix /etc/ant.d/apache-ivy (Resolves: rhbz#1113275)
 


More information about the scm-commits mailing list