From 4cde187ef4bf59fde73487cb696300498c8600d1 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Jul 10 2020 11:57:29 +0000
Subject: bumped minimal sources/target to 1.6


- The scratch build ignored errors in javadoc
- The tests were soomehow running, but there was quite a few <target>/<source> in test poms. Hard to judge impact

---

diff --git a/apache-ivy.spec b/apache-ivy.spec
index bba7e7e..5e8c359 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-ivy
 Version:        2.4.0
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Java-based dependency manager
 
 License:        ASL 2.0
@@ -18,6 +18,7 @@ BuildArch:      noarch
 Patch0:         %{name}-global-settings.patch
 # sent upstream: IVY-1521
 Patch1:         port-to-bc-1.52.patch
+Patch2:         bumpTojdk6.patch
 
 Provides:       ivy = %{version}-%{release}
 
@@ -61,6 +62,7 @@ JavaDoc documentation for %{name}
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Don't hardcode sysconfdir path
 sed -i 's:/etc/ivy/:%{_sysconfdir}/ivy/:' src/java/org/apache/ivy/ant/IvyAntSettings.java
@@ -153,6 +155,9 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 %license LICENSE NOTICE
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-21
+- bumped minimal sources/target to 1.6
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/bumpTojdk6.patch b/bumpTojdk6.patch
new file mode 100644
index 0000000..9639a31
--- /dev/null
+++ b/bumpTojdk6.patch
@@ -0,0 +1,12 @@
+--- apache-ivy-2.4.0/build.properties
++++ apache-ivy-2.4.0/build.properties
+@@ -42,7 +42,7 @@
+ checkstyle.src.dir=${basedir}/src/etc/checkstyle
+ rat.report.dir=${reports.dir}/rat
+ 
+-ivy.minimum.javaversion=1.5
++ivy.minimum.javaversion=1.6
+ debug.mode=on
+ ivy.install.version=1.4.1
+ 
+