From beb9ad94039e632c4f4a53c8215503777b20f8ce767649faf84125fef20fc816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 2 May 2014 09:15:53 +0000 Subject: [PATCH] - Revert the bootstrap breakage. - Revert the bootstrap breakage. OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=52 --- ant-antlr.changes | 5 +++++ ant-antlr.spec | 6 ++++-- ant.changes | 5 +++++ ant.spec | 6 ++++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index e216d8d..90d40c8 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 2 09:01:15 UTC 2014 - tchvatal@suse.com + +- Revert the bootstrap breakage. + ------------------------------------------------------------------- Thu Jan 2 08:36:18 UTC 2014 - mvyskocil@suse.com diff --git a/ant-antlr.spec b/ant-antlr.spec index f7734bb..9b0da56 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -50,7 +50,9 @@ Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap -BuildRequires: java-devel +BuildRequires: java-1_5_0-gcj-compat-devel +#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel %else BuildRequires: java-devel >= 1.5.0 %endif @@ -500,7 +502,7 @@ export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bce export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar -export BOOTJAVAC_OPTS="" +export BOOTJAVAC_OPTS="-C -Wno-deprecated" sh -x ./build.sh --noconfig jars %endif diff --git a/ant.changes b/ant.changes index 2c69bb0..0a85a7b 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 2 09:01:02 UTC 2014 - tchvatal@suse.com + +- Revert the bootstrap breakage. + ------------------------------------------------------------------- Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com diff --git a/ant.spec b/ant.spec index b166b06..cb8e467 100644 --- a/ant.spec +++ b/ant.spec @@ -49,7 +49,9 @@ Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap -BuildRequires: java-devel +BuildRequires: java-1_5_0-gcj-compat-devel +#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel %else BuildRequires: java-devel >= 1.5.0 %endif @@ -499,7 +501,7 @@ export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bce export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar -export BOOTJAVAC_OPTS="" +export BOOTJAVAC_OPTS="-C -Wno-deprecated" sh -x ./build.sh --noconfig jars %endif