OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=12

ant-antlr.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May  7 10:45:54 CEST 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
+
 -------------------------------------------------------------------
 Sun Feb 17 20:44:23 CET 2008 - coolo@suse.de
 

ant-antlr.spec

@@ -11,12 +11,13 @@
 
 
 Name:           ant-antlr
-BuildRequires:  ant antlr bcel bsf jaf jakarta-commons-logging java-devel javamail jdepend junit log4j oro regexp unzip update-alternatives xalan-j2 xerces-j2
+BuildRequires:  ant antlr bcel bsf jaf jakarta-commons-logging javamail jdepend junit log4j oro regexp unzip update-alternatives xalan-j2 xerces-j2
+BuildRequires:  java-1_5_0-gcj-compat-devel
 %define ant_home %{_datadir}/ant
 %define ant_name ant
 %define section  free
 Version:        1.7.0
-Release:        90
+Release:        117
 Url:            http://jakarta.apache.org/
 Group:          Development/Tools/Building
 Source0:        apache-ant-%{version}-src.tar.bz2
@@ -31,6 +32,7 @@ Requires:       %{ant_name} = %{version}
 Conflicts:      ant-optional-clean, ant-optional-full
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch150:       java150_build.patch
+Patch3:         apache-ant-%{version}-source-level.patch
 BuildArch:      noarch
 
 %description 
@@ -40,6 +42,7 @@ antlr tasks for Apache Ant.
 
 
 %package -n ant-commons-logging
+License:        The Apache Software License
 Summary:        Optional commons logging tasks for ant
 Group:          Development/Tools/Building
 Requires:       jakarta-commons-logging
@@ -55,6 +58,7 @@ This package contains optional commons logging tasks for Apache Ant.
 
 
 %package 	-n ant-apache-bsf
+License:        The Apache Software License
 Summary:        Optional apache bsf tasks for ant
 Group:          Development/Tools/Building
 Requires:       bsf
@@ -69,6 +73,7 @@ This package contains optional apache bsf tasks for Apache Ant.
 
 
 %package 	-n ant-apache-resolver
+License:        The Apache Software License
 Summary:        Optional apache resolver tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -83,6 +88,7 @@ This package contains optional apache resolver tasks for Apache Ant.
 
 
 %package 	-n ant-apache-bcel
+License:        The Apache Software License
 Summary:        Optional apache bcel tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -99,6 +105,7 @@ This package contains optional apache bcel tasks for Apache Ant.
 
 
 %package 	-n ant-apache-log4j
+License:        The Apache Software License
 Summary:        Optional apache log4j tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -115,6 +122,7 @@ This package contains optional apache log4j tasks for Apache Ant.
 
 
 %package 	-n ant-apache-oro
+License:        The Apache Software License
 Summary:        Optional apache oro tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -131,6 +139,7 @@ This package contains optional apache oro tasks for Apache Ant.
 
 
 %package 	-n ant-apache-regexp
+License:        The Apache Software License
 Summary:        Optional apache regexp tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -147,6 +156,7 @@ This package contains optional apache regexp tasks for Apache Ant.
 
 
 %package 	-n ant-javamail
+License:        The Apache Software License
 Summary:        Optional javamail tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -162,6 +172,7 @@ This package contains optional javamail tasks for Apache Ant.
 
 
 %package 	-n ant-jdepend
+License:        The Apache Software License
 Summary:        Optional jdepend tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -176,6 +187,7 @@ This package contains optional jdepend tasks for Apache Ant.
 
 
 %package 	-n ant-jmf
+License:        The Apache Software License
 Summary:        Optional jmf tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -189,6 +201,7 @@ This package contains optional jmf tasks for Apache Ant.
 
 
 %package 	-n ant-junit
+License:        The Apache Software License
 Summary:        Optional junit tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -203,6 +216,7 @@ This package contains optional JUnit tasks for Apache Ant.
 
 
 %package 	-n ant-nodeps
+License:        The Apache Software License
 Summary:        Optional tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -216,6 +230,7 @@ This package contains optional tasks for Apache Ant.
 
 
 %package 	-n ant-swing
+License:        The Apache Software License
 Summary:        Optional swing tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -229,6 +244,7 @@ This package contains optional swing tasks for Apache Ant.
 
 
 %package 	-n ant-trax
+License:        The Apache Software License
 Summary:        Optional trax tasks for ant
 Group:          Development/Tools/Building
 Requires:       %{ant_name} = %{version}
@@ -250,6 +266,7 @@ This package contains optional trax tasks for Apache Ant.
 # Fix temp directory used for file containing large command strings (> 4k)
 # clean jar files
 %patch150 -p1
+%patch3 -b .sav3
 find . -name "*.jar" -exec rm -f {} \;
 # -----------------------------------------------------------------------------
 
@@ -261,6 +278,9 @@ export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis
 #[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
 #[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
 export JAVA_HOME
+export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
+export CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
+export BOOTJAVAC_OPTS="-C -Wno-deprecated"
 sh build.sh --noconfig jars javadocs
 
 %install
@@ -496,6 +516,9 @@ popd
 %{ant_home}/etc/coverage-frames.xsl
 
 %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
 * Sun Feb 17 2008 coolo@suse.de
 - fix changelog for build service
 * Sun Jul 08 2007 dbornkessel@suse.de

ant.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May  7 10:45:27 CEST 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 13:52:03 CEST 2007 - skh@suse.de
 

ant.spec

@@ -12,12 +12,12 @@
 
 
 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}
 Version:        1.7.0
-Release:        80
+Release:        105
 Summary:        A Java-Based Build Tool
 License:        The Apache Software License
 Url:            http://jakarta.apache.org/
@@ -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
@@ -78,6 +79,7 @@ based on the OS used.
 
 
 %package 	manual
+License:        The Apache Software License
 Summary:        Manual for ant
 Group:          Development/Tools/Building
 
@@ -89,6 +91,7 @@ This package contains the manual for Apache Ant.
 
 
 %package 	javadoc
+License:        The Apache Software License
 Summary:        Javadoc for ant
 Group:          Development/Tools/Building
 PreReq:         coreutils
@@ -101,6 +104,7 @@ This package contains the javadoc documentation for Apache Ant.
 
 
 %package 	scripts
+License:        The Apache Software License
 Summary:        Additional scripts for ant
 Group:          Development/Tools/Building
 #AutoReqProv:    no
@@ -121,6 +125,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 +141,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 +235,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