From 99375e6548fce242600169a0f030d8bbf9af5646 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Apr 01 2015 10:44:16 +0000
Subject: Update to upstream version 2.4.0


---

diff --git a/.gitignore b/.gitignore
index 0c2101b..ba65738 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 apache-ivy-2.1.0-src.tar.gz
 /apache-ivy-2.2.0-src.tar.gz
 /apache-ivy-2.3.0-src.tar.gz
+/apache-ivy-2.4.0-src.tar.gz
diff --git a/apache-ivy-global-settings.patch b/apache-ivy-global-settings.patch
index ecda708..29cf61e 100644
--- a/apache-ivy-global-settings.patch
+++ b/apache-ivy-global-settings.patch
@@ -1,12 +1,11 @@
---- 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];
+--- src/java/org/apache/ivy/ant/IvyAntSettings.java~	2014-05-23 19:56:50.000000000 +0200
++++ src/java/org/apache/ivy/ant/IvyAntSettings.java	2015-04-01 12:37:37.537520590 +0200
+@@ -346,7 +346,7 @@
+         File[] settingsLocations = new File[] {
+                 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];
+             task.log("searching settings file: trying " + file, Project.MSG_VERBOSE);
diff --git a/apache-ivy.spec b/apache-ivy.spec
index a7edb51..996c0c4 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,6 +1,6 @@
 Name:           apache-ivy
-Version:        2.3.0
-Release:        17%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        Java-based dependency manager
 
 License:        ASL 2.0
@@ -29,6 +29,9 @@ BuildRequires:  apache-commons-parent
 BuildRequires:  sonatype-oss-parent
 BuildRequires:  apache-parent
 BuildRequires:  ivy-local >= 4
+BuildRequires:  jsch-agent-proxy-connector-factory
+BuildRequires:  jsch-agent-proxy-core
+BuildRequires:  jsch-agent-proxy-jsch
 
 %description
 Apache Ivy is a tool for managing (recording, tracking, resolving and
@@ -53,7 +56,7 @@ JavaDoc documentation for %{name}
 %mvn_file : %{name}/ivy ivy
 
 # Fix messed-up encodings
-for F in RELEASE_NOTES README LICENSE NOTICE CHANGES.txt
+for F in README LICENSE NOTICE
 do
         sed 's/\r//' $F |iconv -f iso8859-1 -t utf8 >$F.utf8
         touch -r $F $F.utf8
@@ -86,12 +89,16 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 
 %files -f .mfiles
 %{_sysconfdir}/ant.d/%{name}
-%doc LICENSE NOTICE RELEASE_NOTES CHANGES.txt README
+%doc README
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Wed Apr  1 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-1
+- Update to upstream version 2.4.0
+
 * Fri Sep 19 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.0-17
 - Add compat symlink for ivy.jar
 
diff --git a/sources b/sources
index 44f3bcf..d5fe65c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53f27c8ef5da2eff5039efa6c45b84e7  apache-ivy-2.3.0-src.tar.gz
+bd16ef9a402859522606ed9edd468f1f  apache-ivy-2.4.0-src.tar.gz