diff --git a/ant.spec b/ant.spec index 847cf69..45ebf93 100644 --- a/ant.spec +++ b/ant.spec @@ -3,7 +3,7 @@ Name: ant Version: 1.6.2 -Release: 3jpp_3fc +Release: 3jpp_4fc Epoch: 0 Summary: Ant build tool for java Summary(it): Tool per la compilazione di programmi java @@ -20,6 +20,7 @@ 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 @@ -325,6 +326,12 @@ 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 {} \; @@ -582,6 +589,10 @@ fi # ----------------------------------------------------------------------------- %changelog +* Fri Apr 08 2005 Andrew Overholt 1.6.2-3jpp_4fc +- Back out ant-apache-javac-ecj.patch and ant.orig changes as they stop eclipse + from building. + * 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.