rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

Accepting request 231159 from home:deadpoint:branches:Java:packages

Browse Source 
Update to build with openjdk

OBS-URL: https://build.opensuse.org/request/show/231159
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=50
This commit is contained in:
Duncan Mac-Vicar 2014-04-26 13:11:11 +00:00 committed by Git OBS Bridge
parent 1b752cc34f
commit 05775eedad
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ant-antlr.spec
View File

@ -51,9 +51,7 @@ Patch1: apache-ant-class-path-in-manifest.patch
%if %bootstrap
BuildRequires: gpg-offline
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
BuildRequires: java-devel
%else
BuildRequires: java-devel >= 1.5.0
%endif
@ -506,7 +504,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="-C -Wno-deprecated"
export BOOTJAVAC_OPTS=""
sh -x ./build.sh --noconfig jars
%endif

5
ant.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 23 12:55:35 UTC 2014 - darin@darins.net
- Update packaging to build the openjdk and not gcj
-------------------------------------------------------------------
Thu Jan 2 08:36:18 UTC 2014 - mvyskocil@suse.com

6
ant.spec
View File

@ -50,9 +50,7 @@ Patch1: apache-ant-class-path-in-manifest.patch
%if %bootstrap
BuildRequires: gpg-offline
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
BuildRequires: java-devel
%else
BuildRequires: java-devel >= 1.5.0
%endif
@ -505,7 +503,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="-C -Wno-deprecated"
export BOOTJAVAC_OPTS=""
sh -x ./build.sh --noconfig jars
%endif