From ce6466cb09d4e73fa5176646a12255d162544e7e78dbca670725aaa0cfe9496c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 7 May 2008 11:41:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=8 --- ant-antlr.changes | 6 ++++++ ant-antlr.spec | 11 ++++++++++- ant.changes | 6 ++++++ ant.spec | 12 ++++++++++-- apache-ant-1.7.0-source-level.patch | 13 +++++++++++++ ready | 0 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 apache-ant-1.7.0-source-level.patch delete mode 100644 ready diff --git a/ant-antlr.changes b/ant-antlr.changes index 320f465..e20be45 100644 --- a/ant-antlr.changes +++ b/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 diff --git a/ant-antlr.spec b/ant-antlr.spec index 53d41d8..e57ba58 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -11,7 +11,8 @@ 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 @@ -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 @@ -250,6 +252,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 +264,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 +502,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 diff --git a/ant.changes b/ant.changes index 0a959ce..60304fa 100644 --- a/ant.changes +++ b/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 diff --git a/ant.spec b/ant.spec index a5fa60f..79d80c4 100644 --- a/ant.spec +++ b/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 diff --git a/apache-ant-1.7.0-source-level.patch b/apache-ant-1.7.0-source-level.patch new file mode 100644 index 0000000..7e21208 --- /dev/null +++ b/apache-ant-1.7.0-source-level.patch @@ -0,0 +1,13 @@ +--- build.xml ++++ build.xml +@@ -64,8 +64,8 @@ + + + +- +- ++ ++ + + + diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000