From 2d1ffa2c1dfb5b60c0d0169f5a6169058db28b6554c763c0afd74f19b80c6694 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Sep 2017 18:19:58 +0000 Subject: [PATCH] Fix build with java 9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant-contrib?expand=0&rev=28 --- ant-contrib-sourcetarget.patch | 10 ++++++++++ ant-contrib.changes | 8 ++++++++ ant-contrib.spec | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ant-contrib-sourcetarget.patch diff --git a/ant-contrib-sourcetarget.patch b/ant-contrib-sourcetarget.patch new file mode 100644 index 0000000..383ad44 --- /dev/null +++ b/ant-contrib-sourcetarget.patch @@ -0,0 +1,10 @@ +--- ant-contrib/build.properties 2006-11-02 17:46:26.000000000 +0100 ++++ ant-contrib/build.properties 2017-09-06 20:13:43.067914247 +0200 +@@ -3,5 +3,5 @@ + jar.name=${project.name}.jar + jar.name.versioned=${project.name}-${project.version}.jar + ivy.deliver.revision=${project.version} +-jdk.source=1.4 +-jdk.target=1.4 ++jdk.source=1.6 ++jdk.target=1.6 diff --git a/ant-contrib.changes b/ant-contrib.changes index 42f5d75..0d30cd1 100644 --- a/ant-contrib.changes +++ b/ant-contrib.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 6 18:17:00 UTC 2017 - fstrba@suse.com + +- Added patch: + * ant-contrib-sourcetarget.patch + - build with java source and target 1.6 + - fixes the build with java 9 + ------------------------------------------------------------------- Fri May 19 09:08:21 UTC 2017 - tchvatal@suse.com diff --git a/ant-contrib.spec b/ant-contrib.spec index f65a87a..a417ade 100644 --- a/ant-contrib.spec +++ b/ant-contrib.spec @@ -32,12 +32,13 @@ Patch0: local-ivy.patch Patch1: ant-contrib-antservertest.patch Patch2: ant-contrib-pom.patch Patch3: ant-contrib-1.0b3-enable-for-task.patch +Patch4: ant-contrib-sourcetarget.patch BuildRequires: ant BuildRequires: apache-ivy BuildRequires: bcel >= 5.1 BuildRequires: commons-httpclient BuildRequires: commons-logging -BuildRequires: java-devel +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -75,6 +76,7 @@ cp %{SOURCE2} LICENSE-2.0.txt %patch1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +