From 46b2aeb8ce4a3a78dc587f99a3cd91f9a51c2b43 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Jun 26 2014 04:52:12 +0000 Subject: Fix /etc/ant.d/apache-ivy (Resolves: rhbz#1113275) --- diff --git a/apache-ivy.spec b/apache-ivy.spec index a9b16c1..77cae13 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,6 +1,6 @@ Name: apache-ivy Version: 2.3.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java-based dependency manager License: ASL 2.0 @@ -72,14 +72,14 @@ rm -rf doc build/doc sed -i /ivy:publish/s/local/xmvn/ build.xml %build -%ant -Divy.mode=local -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundle.version.qualifier= -Dtarget.ivy.version=%{version} jar javadoc publish-local +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 %install %mvn_install -J build/doc/reports/api mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d -echo "ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} +echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %files -f .mfiles %{_sysconfdir}/ant.d/%{name} @@ -89,6 +89,9 @@ echo "ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %doc LICENSE NOTICE %changelog +* Thu Jun 26 2014 Michal Srb - 2.3.0-14 +- Fix /etc/ant.d/apache-ivy (Resolves: rhbz#1113275) + * Mon Jun 23 2014 Michal Srb - 2.3.0-13 - Add BR on missing parent POMs