rpms/ant/devel ant.spec, 1.48, 1.49 apache-ant-javac-ecj.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	ant.spec 
Removed Files:
	apache-ant-javac-ecj.patch 
Log Message:
Remove gcj workaround (not correct, so assume not necessary)


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ant.spec	15 Jun 2005 11:41:23 -0000	1.48
+++ ant.spec	15 Jun 2005 11:55:56 -0000	1.49
@@ -18,7 +18,6 @@
 # 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
 Patch3:         apache-ant-bz157750.patch
 Requires:       jaxp_parser_impl
 Requires:       jpackage-utils >= 0:1.5
@@ -344,12 +343,6 @@
 # Build OPT_JAR_LIST from the contents of /etc/ant.d/
 %patch1 -p1
 
-# fix classpath for java-gcj-compat
-if java -version 2>&1 | grep -q "gcj"; then
-%patch2 -p1
-rm -f src/script/ant.orig
-fi
-
 # build the javah task (#157750) and make it work with java-gcj-compat
 %patch3 -p1 -b .orig
 
@@ -652,6 +645,7 @@
 %changelog
 * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com>
 - Add the bsf subpackage since we now ship bsf.
+- Remove gcj workaround (not correct, so assume not necessary).
 
 * Mon Jun  6 2005 Gary Benson <gbenson at redhat.com>
 - Make the javah task fall back to executing javah if


--- apache-ant-javac-ecj.patch DELETED ---