diff --git a/ant.spec b/ant.spec index e2af245..3e8197c 100644 --- a/ant.spec +++ b/ant.spec @@ -20,7 +20,6 @@ Source2: apache-ant-%{version}.ant.conf # Fix temp directory used for file containing large command strings (> 4k) Patch0: apache-ant-%{version}.patch Patch1: apache-ant-%{version}-rpm.patch -Patch2: apache-ant-javac-ecj.patch Requires: jaxp_parser_impl Requires: jpackage-utils >= 0:1.5 # XXX make beehive play nice @@ -311,12 +310,6 @@ Javadoc pour %{name}. # Build OPT_JAR_LIST from the contents of /etc/ant.d/ %patch1 -p1 -# fix classpath for java-x.y.z-gcj-compat -if java -version 2>&1 | grep -q "gcj"; then -%patch2 -p1 -rm -f src/script/ant.orig -fi - # clean jar files find . -name "*.jar" -exec rm -f {} \; @@ -332,10 +325,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 -if java -version 2>&1 | grep -q "gcj"; then - # make sure we do not use an installed native ant during the build - export ANT_OPTS="-Dgnu.gcj.runtime.VMClassLoader.library_control=never" -fi sh build.sh --noconfig jars javadocs # ----------------------------------------------------------------------------- @@ -572,6 +561,7 @@ fi %changelog * Tue Mar 29 2005 Gary Benson 0:1.6.2-3jpp_3fc - Add NOTICE file as per Apache License version 2.0. +- Remove some now unnecessary gcj workarounds. * Thu Jan 20 2005 Gary Benson 0:1.6.2-3jpp_2fc - Use jdtcore.jar instead of ecj.jar when running under libgcj.