This commit is contained in:
12
ant.spec
12
ant.spec
@@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
Name: ant
|
||||
BuildRequires: java-devel unzip xerces-j2 xml-commons-apis-bootstrap
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel unzip xerces-j2 xml-commons-apis-bootstrap
|
||||
%define ant_home %{_datadir}/ant
|
||||
%define section free
|
||||
%define cvs_name apache-%{name}
|
||||
@@ -30,6 +30,7 @@ Source2: %{cvs_name}-%{version}.ant.conf
|
||||
Patch0: %{name}-%{version}-use_system_libs.patch
|
||||
Patch1: %{cvs_name}-%{version}-rpm.patch
|
||||
Patch2: %{name}-%{version}-disable-junit-tests.patch
|
||||
Patch3: %{cvs_name}-%{version}-source-level.patch
|
||||
Patch150: java150_build.patch
|
||||
Requires: xerces-j2 >= 2.7.1-2
|
||||
Requires: jaxp_parser_impl
|
||||
@@ -121,6 +122,7 @@ Ant.
|
||||
%patch0
|
||||
#%patch1
|
||||
%patch2
|
||||
%patch3 -b .sav3
|
||||
#%patch150 -p1
|
||||
# Fix temp directory used for file containing large command strings (> 4k)
|
||||
# clean jar files
|
||||
@@ -136,7 +138,10 @@ export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis
|
||||
#[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
|
||||
#. /usr/share/java-utils/java-functions
|
||||
export JAVA_HOME
|
||||
sh bootstrap.sh
|
||||
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
||||
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
|
||||
sh bootstrap.sh
|
||||
export CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
|
||||
sh build.sh --noconfig jars javadocs
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
@@ -227,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Wed May 07 2008 mvyskocil@suse.cz
|
||||
- build using gcj, to allow a openjdk6 bootstrap
|
||||
- change a source and a target level to 1.5 in build.xml
|
||||
* Tue Aug 14 2007 skh@suse.de
|
||||
- disable junit tests and remove junit from BuildRequires to break
|
||||
circular build dependency
|
||||
|
Reference in New Issue
Block a user