From e5ab7499792de592840cdabc1d1f63ec3236b84f73d108de9ab7716eb389d17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 4 Jan 2017 10:45:56 +0000 Subject: [PATCH] - Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7 - Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=72 --- ant-antlr.changes | 5 +++++ ant-antlr.spec | 3 ++- ant-junit.changes | 5 +++++ ant-junit.spec | 3 ++- ant.spec | 3 ++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index adb9d80..2afec07 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 4 10:44:04 UTC 2017 - tchvatal@suse.com + +- Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7 + ------------------------------------------------------------------- Fri Jan 15 22:01:37 UTC 2016 - opensuse@dstoecker.de diff --git a/ant-antlr.spec b/ant-antlr.spec index c2ac588..808bc66 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -53,7 +53,6 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch2: apache-ant-old-gcj-build.patch #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel -BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.5.0 BuildRequires: javapackages-tools BuildRequires: unzip @@ -79,6 +78,8 @@ Obsoletes: ant-nodeps < %{version} Provides: ant-nodeps = %{version} Obsoletes: ant-trax < %{version} Provides: ant-trax = %{version} +%else +BuildRequires: antlr-bootstrap %endif %if %{with antlr} Requires: antlr diff --git a/ant-junit.changes b/ant-junit.changes index adb9d80..2afec07 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 4 10:44:04 UTC 2017 - tchvatal@suse.com + +- Do not use gcj but java 1.8.0+ for building as gcj is gone from gcc7 + ------------------------------------------------------------------- Fri Jan 15 22:01:37 UTC 2016 - opensuse@dstoecker.de diff --git a/ant-junit.spec b/ant-junit.spec index 4f75498..c750654 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -53,7 +53,6 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch2: apache-ant-old-gcj-build.patch #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel -BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.5.0 BuildRequires: javapackages-tools BuildRequires: unzip @@ -79,6 +78,8 @@ Obsoletes: ant-nodeps < %{version} Provides: ant-nodeps = %{version} Obsoletes: ant-trax < %{version} Provides: ant-trax = %{version} +%else +BuildRequires: antlr-bootstrap %endif %if %{with antlr} Requires: antlr diff --git a/ant.spec b/ant.spec index aa8b968..05d4f29 100644 --- a/ant.spec +++ b/ant.spec @@ -52,7 +52,6 @@ Patch1: apache-ant-class-path-in-manifest.patch Patch2: apache-ant-old-gcj-build.patch #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel -BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.5.0 BuildRequires: javapackages-tools BuildRequires: unzip @@ -78,6 +77,8 @@ Obsoletes: ant-nodeps < %{version} Provides: ant-nodeps = %{version} Obsoletes: ant-trax < %{version} Provides: ant-trax = %{version} +%else +BuildRequires: antlr-bootstrap %endif %if %{with antlr} Requires: antlr