From 13b3d2d5429536a10687b433d828e73d69df0f3b89ba77fc5edf57dcc253b475 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 10 May 2008 02:27:03 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=13 --- ant-antlr.changes | 6 ------ ant-antlr.spec | 27 ++------------------------- ant.changes | 6 ------ ant.spec | 17 +++-------------- 4 files changed, 5 insertions(+), 51 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index e20be45..320f465 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 75fdbd9..53d41d8 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -11,13 +11,12 @@ Name: ant-antlr -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 +BuildRequires: ant antlr bcel bsf jaf jakarta-commons-logging java-devel javamail jdepend junit log4j oro regexp unzip update-alternatives xalan-j2 xerces-j2 %define ant_home %{_datadir}/ant %define ant_name ant %define section free Version: 1.7.0 -Release: 117 +Release: 90 Url: http://jakarta.apache.org/ Group: Development/Tools/Building Source0: apache-ant-%{version}-src.tar.bz2 @@ -32,7 +31,6 @@ 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 @@ -42,7 +40,6 @@ 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 @@ -58,7 +55,6 @@ 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 @@ -73,7 +69,6 @@ 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} @@ -88,7 +83,6 @@ 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} @@ -105,7 +99,6 @@ 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} @@ -122,7 +115,6 @@ 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} @@ -139,7 +131,6 @@ 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} @@ -156,7 +147,6 @@ 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} @@ -172,7 +162,6 @@ 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} @@ -187,7 +176,6 @@ 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} @@ -201,7 +189,6 @@ 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} @@ -216,7 +203,6 @@ 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} @@ -230,7 +216,6 @@ 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} @@ -244,7 +229,6 @@ 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} @@ -266,7 +250,6 @@ 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 {} \; # ----------------------------------------------------------------------------- @@ -278,9 +261,6 @@ 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 @@ -516,9 +496,6 @@ 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 60304fa..0a959ce 100644 --- a/ant.changes +++ b/ant.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 ccac691..a5fa60f 100644 --- a/ant.spec +++ b/ant.spec @@ -12,12 +12,12 @@ Name: ant -BuildRequires: java-1_5_0-gcj-compat-devel unzip xerces-j2 xml-commons-apis-bootstrap +BuildRequires: java-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: 105 +Release: 80 Summary: A Java-Based Build Tool License: The Apache Software License Url: http://jakarta.apache.org/ @@ -30,7 +30,6 @@ 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 @@ -79,7 +78,6 @@ based on the OS used. %package manual -License: The Apache Software License Summary: Manual for ant Group: Development/Tools/Building @@ -91,7 +89,6 @@ 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 @@ -104,7 +101,6 @@ 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 @@ -125,7 +121,6 @@ Ant. %patch0 #%patch1 %patch2 -%patch3 -b .sav3 #%patch150 -p1 # Fix temp directory used for file containing large command strings (> 4k) # clean jar files @@ -141,10 +136,7 @@ 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 -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 bootstrap.sh sh build.sh --noconfig jars javadocs # ----------------------------------------------------------------------------- @@ -235,9 +227,6 @@ 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