- Revert the bootstrap breakage.

- Revert the bootstrap breakage.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=52
This commit is contained in:
Tomáš Chvátal 2014-05-02 09:15:53 +00:00 committed by Git OBS Bridge
parent 895b578071
commit 47891f6932
4 changed files with 18 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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