From 5d888ec874ff205427e5e51beba767a24df7413f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jan 16 2014 14:05:06 +0000 Subject: BuildRequire ivy-local >= 3.5.0-2 --- diff --git a/apache-ivy.spec b/apache-ivy.spec index ebd19fe..5c5bf8c 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,6 +1,6 @@ Name: apache-ivy Version: 2.3.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java-based dependency manager License: ASL 2.0 @@ -24,7 +24,7 @@ BuildRequires: bouncycastle-pg BuildRequires: jakarta-commons-httpclient BuildRequires: jsch BuildRequires: jakarta-oro -BuildRequires: ivy-local +BuildRequires: ivy-local >= 3.5.0-2 BuildRequires: maven-local %description @@ -66,7 +66,7 @@ sed -i "s/commons.vfs/&2/" src/java/org/apache/ivy/plugins/repository/vfs/* rm -rf doc build/doc %build -%ant -Divy.mode=local -Divy.settings.file=%{_sysconfdir}/ivy/ivysettings.xml -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundle.version.qualifier= -Dtarget.ivy.version=%{version} jar javadoc +%ant -Divy.mode=local -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundle.version.qualifier= -Dtarget.ivy.version=%{version} jar javadoc %install @@ -86,6 +86,9 @@ echo "ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %doc LICENSE NOTICE %changelog +* Thu Jan 16 2014 Mikolaj Izdebski - 2.3.0-9 +- BuildRequire ivy-local >= 3.5.0-2 + * Thu Jan 16 2014 Mikolaj Izdebski - 2.3.0-8 - Build with ivy-local - Add patch for global settings