rpms/ant/devel ant.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23631

Modified Files:
	ant.spec 
Log Message:
* Fri Apr 08 2005 Andrew Overholt <overholt at redhat.com> 1.6.2-3jpp_4fc
- Back out ant-apache-javac-ecj.patch and ant.orig changes as they stop eclipse
  from building.



Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ant.spec	6 Apr 2005 10:32:52 -0000	1.25
+++ ant.spec	8 Apr 2005 19:59:36 -0000	1.26
@@ -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 @@
 # 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 @@
 # 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 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Apr 08 2005 Andrew Overholt <overholt at redhat.com> 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 <gbenson at redhat.com> 0:1.6.2-3jpp_3fc
 - Add NOTICE file as per Apache License version 2.0.
 - Remove some now unnecessary gcj workarounds.