diff --git a/apache-ivy-port-to-current-ant.patch b/apache-ivy-port-to-current-ant.patch new file mode 100644 index 0000000..e7e79e0 --- /dev/null +++ b/apache-ivy-port-to-current-ant.patch @@ -0,0 +1,25 @@ +From 5f0c74a2717d2be45e9e5792772fd0b98a750a2b Mon Sep 17 00:00:00 2001 +From: Michael Simacek +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 edc53b6..d5cf3a3 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -3,7 +3,7 @@ Name: apache-ivy Version: 2.4.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java-based dependency manager License: ASL 2.0 @@ -17,6 +17,8 @@ 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} @@ -60,6 +62,7 @@ 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 @@ -122,6 +125,9 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %license LICENSE NOTICE %changelog +* Fri Mar 16 2018 Michael Simacek - 2.4.0-11 +- Fix build against ant 1.10.2 + * Wed Feb 07 2018 Fedora Release Engineering - 2.4.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild