From f4d26e1d17c77a3700b7f1bcdfac56af318f66ae Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jan 16 2014 13:08:33 +0000
Subject: Build with ivy-local


---

diff --git a/apache-ivy-global-settings.patch b/apache-ivy-global-settings.patch
new file mode 100644
index 0000000..ecda708
--- /dev/null
+++ b/apache-ivy-global-settings.patch
@@ -0,0 +1,12 @@
+--- src/java/org/apache/ivy/ant/IvyAntSettings.java~	2012-08-15 23:24:56.000000000 +0200
++++ src/java/org/apache/ivy/ant/IvyAntSettings.java	2014-01-16 14:03:25.403925272 +0100
+@@ -343,7 +343,8 @@
+                 new File(getProject().getBaseDir(), settingsFileName),
+                 new File(getProject().getBaseDir(), "ivyconf.xml"), 
+                 new File(settingsFileName),
+-                new File("ivyconf.xml") 
++                new File("ivyconf.xml"),
++                new File("/etc/ivy/ivysettings.xml")
+         };
+         for (int i = 0; i < settingsLocations.length; i++) {
+             file = settingsLocations[i];
diff --git a/apache-ivy.spec b/apache-ivy.spec
index f731c33..ebd19fe 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,6 +1,6 @@
 Name:           apache-ivy
 Version:        2.3.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Java-based dependency manager
 
 License:        ASL 2.0
@@ -8,15 +8,23 @@ URL:            http://ant.apache.org/ivy/
 Source0:        http://www.apache.org/dist/ant/ivy/%{version}/%{name}-%{version}-src.tar.gz
 BuildArch:      noarch
 
+# Non-upstreamable.  Add /etc/ivy/ivysettings.xml at the end list of
+# settings files Ivy tries to load.  This file will be used only as
+# last resort, when no other setting files exist.
+Patch0:         %{name}-global-settings.patch
+
 Provides:       ivy = %{version}-%{release}
 
 BuildRequires:  ant
+BuildRequires:  ant-contrib
+BuildRequires:  ant-testutil
 BuildRequires:  apache-commons-vfs
 BuildRequires:  bouncycastle
 BuildRequires:  bouncycastle-pg
 BuildRequires:  jakarta-commons-httpclient
 BuildRequires:  jsch
 BuildRequires:  jakarta-oro
+BuildRequires:  ivy-local
 BuildRequires:  maven-local
 
 %description
@@ -36,6 +44,7 @@ JavaDoc documentation for %{name}
 
 %prep
 %setup -q
+%patch0
 
 # Fix messed-up encodings
 for F in RELEASE_NOTES README LICENSE NOTICE CHANGES.txt
@@ -57,12 +66,7 @@ sed -i "s/commons.vfs/&2/" src/java/org/apache/ivy/plugins/repository/vfs/*
 rm -rf doc build/doc
 
 %build
-# Craft class path
-mkdir -p lib
-build-jar-repository lib ant commons-vfs jakarta-commons-httpclient jakarta-oro jsch bcprov bcpg
-
-# Build
-ant /localivy /offline -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundle.version.qualifier= -Dtarget.ivy.version=%{version} jar javadoc
+%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
 
 
 %install
@@ -82,6 +86,10 @@ echo "ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Jan 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.0-8
+- Build with ivy-local
+- Add patch for global settings
+
 * Thu Jan 02 2014 Michal Srb <msrb@redhat.com> - 2.3.0-7
 - Remove prebuilt documentation in %%prep
 - Install NOTICE file with javadoc subpackage