From 2ec5110288db75e385c25011ed59b46faf13d916 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mar 28 2018 12:35:53 +0000
Subject: Remove now unneeded patch


Ant restored backwards compatibility in 1.1.3

This reverts commit f6193fd77a1df43c4a05c1f703b3a8443c85bb7e.

---

diff --git a/apache-ivy-port-to-current-ant.patch b/apache-ivy-port-to-current-ant.patch
deleted file mode 100644
index e7e79e0..0000000
--- a/apache-ivy-port-to-current-ant.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5f0c74a2717d2be45e9e5792772fd0b98a750a2b Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Fri, 16 Mar 2018 13:55:23 +0100
-Subject: [PATCH] Port to current ant
-
----
- src/java/org/apache/ivy/ant/IvyCacheFileset.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/java/org/apache/ivy/ant/IvyCacheFileset.java b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
-index 891a336..7143946 100644
---- a/src/java/org/apache/ivy/ant/IvyCacheFileset.java
-+++ b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
-@@ -165,7 +165,7 @@ public class IvyCacheFileset extends IvyCacheTask {
-             return new EmptyIterator();
-         }
- 
--        public Object clone() {
-+        public FileSet clone() {
-             return new EmptyFileSet();
-         }
- 
--- 
-2.14.3
-
diff --git a/apache-ivy.spec b/apache-ivy.spec
index d5cf3a3..4bf67aa 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -3,7 +3,7 @@
 
 Name:           apache-ivy
 Version:        2.4.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Java-based dependency manager
 
 License:        ASL 2.0
@@ -17,8 +17,6 @@ BuildArch:      noarch
 Patch0:         %{name}-global-settings.patch
 # sent upstream: IVY-1521
 Patch1:         port-to-bc-1.52.patch
-# Make it compile against ant >= 1.10.2
-Patch2:         apache-ivy-port-to-current-ant.patch
 
 Provides:       ivy = %{version}-%{release}
 
@@ -62,7 +60,6 @@ JavaDoc documentation for %{name}
 %setup -q
 %patch0
 %patch1 -p1
-%patch2 -p1
 
 # Don't hardcode sysconfdir path
 sed -i 's:/etc/ivy/:%{_sysconfdir}/ivy/:' src/java/org/apache/ivy/ant/IvyAntSettings.java
@@ -125,6 +122,9 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 %license LICENSE NOTICE
 
 %changelog
+* Wed Mar 28 2018 Michael Simacek <msimacek@redhat.com> - 2.4.0-12
+- Remove now unneeded patch
+
 * Fri Mar 16 2018 Michael Simacek <msimacek@redhat.com> - 2.4.0-11
 - Fix build against ant 1.10.2