From 44b2b49da2e38309d482b46cc1de7c303c4b07fbb03d8cc53113270a52984e00 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 15 May 2018 06:05:51 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=111 --- ant-antlr.changes | 14 ++++++++++++++ ant-antlr.spec | 8 +++++--- ant-junit.changes | 14 ++++++++++++++ ant-junit.spec | 8 +++++--- ant.changes | 9 +++++++++ ant.spec | 6 +++--- apache-ant-1.9.9-sourcetarget.patch | 4 ++-- 7 files changed, 52 insertions(+), 11 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index 5f12127..2851656 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 +- Modified patch: + * apache-ant-1.9.9-sourcetarget.patch + - Build with source/target 8 + +------------------------------------------------------------------- +Fri Feb 23 10:24:31 UTC 2018 - ecsos@opensuse.org + +- fix build error for Leap 42.3 + ------------------------------------------------------------------- Thu Feb 22 11:43:31 UTC 2018 - tchvatal@suse.com diff --git a/ant-antlr.spec b/ant-antlr.spec index 9cd5282..38c9330 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -43,7 +43,7 @@ Patch5: apache-ant-bootstrap.patch Patch6: reproducible-build-date.patch Patch7: ant-python3.patch BuildRequires: antlr-bootstrap -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: xml-commons-apis-bootstrap @@ -67,7 +67,7 @@ BuildRequires: xml-commons-apis BuildRequires: strip-nondeterminism %endif %if %{with bootstrap} -Requires: java-devel >= 1.6 +Requires: java-devel >= 1.8 Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis @@ -381,7 +381,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar %if %{with bootstrap} export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME="%{java_home}" -export BOOTJAVAC_OPTS="-source 1.6 -target 1.6" +export BOOTJAVAC_OPTS="-source 8 -target 8" sh -x ./build.sh --noconfig jars %endif @@ -531,6 +531,8 @@ find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \ -a ! -name tagdiff.xsl \ -print -delete %endif +# remove *.orig +rm -rf %{buildroot}/usr/bin/ant.orig %if %{with bootstrap} %files diff --git a/ant-junit.changes b/ant-junit.changes index 5f12127..2851656 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 +- Modified patch: + * apache-ant-1.9.9-sourcetarget.patch + - Build with source/target 8 + +------------------------------------------------------------------- +Fri Feb 23 10:24:31 UTC 2018 - ecsos@opensuse.org + +- fix build error for Leap 42.3 + ------------------------------------------------------------------- Thu Feb 22 11:43:31 UTC 2018 - tchvatal@suse.com diff --git a/ant-junit.spec b/ant-junit.spec index 0786777..889c709 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -43,7 +43,7 @@ Patch5: apache-ant-bootstrap.patch Patch6: reproducible-build-date.patch Patch7: ant-python3.patch BuildRequires: antlr-bootstrap -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: xml-commons-apis-bootstrap @@ -67,7 +67,7 @@ BuildRequires: xml-commons-apis BuildRequires: strip-nondeterminism %endif %if %{with bootstrap} -Requires: java-devel >= 1.6 +Requires: java-devel >= 1.8 Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis @@ -381,7 +381,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar %if %{with bootstrap} export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME="%{java_home}" -export BOOTJAVAC_OPTS="-source 1.6 -target 1.6" +export BOOTJAVAC_OPTS="-source 8 -target 8" sh -x ./build.sh --noconfig jars %endif @@ -531,6 +531,8 @@ find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \ -a ! -name tagdiff.xsl \ -print -delete %endif +# remove *.orig +rm -rf %{buildroot}/usr/bin/ant.orig %if %{with bootstrap} %files diff --git a/ant.changes b/ant.changes index a731823..2851656 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue May 15 05:02:22 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 +- Modified patch: + * apache-ant-1.9.9-sourcetarget.patch + - Build with source/target 8 + ------------------------------------------------------------------- Fri Feb 23 10:24:31 UTC 2018 - ecsos@opensuse.org diff --git a/ant.spec b/ant.spec index 9b798ab..64a8a82 100644 --- a/ant.spec +++ b/ant.spec @@ -42,7 +42,7 @@ Patch5: apache-ant-bootstrap.patch Patch6: reproducible-build-date.patch Patch7: ant-python3.patch BuildRequires: antlr-bootstrap -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: xml-commons-apis-bootstrap @@ -66,7 +66,7 @@ BuildRequires: xml-commons-apis BuildRequires: strip-nondeterminism %endif %if %{with bootstrap} -Requires: java-devel >= 1.6 +Requires: java-devel >= 1.8 Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis @@ -380,7 +380,7 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar %if %{with bootstrap} export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME="%{java_home}" -export BOOTJAVAC_OPTS="-source 1.6 -target 1.6" +export BOOTJAVAC_OPTS="-source 8 -target 8" sh -x ./build.sh --noconfig jars %endif diff --git a/apache-ant-1.9.9-sourcetarget.patch b/apache-ant-1.9.9-sourcetarget.patch index 1587832..d4b242a 100644 --- a/apache-ant-1.9.9-sourcetarget.patch +++ b/apache-ant-1.9.9-sourcetarget.patch @@ -6,8 +6,8 @@ - - -+ -+ ++ ++