rpms/ant/devel apache-ant-1.7.0-javah.patch, NONE, 1.1 ant.spec, 1.84, 1.85 apache-ant-1.6.5-javah.patch, 1.3, NONE

[Fernando Nasser (fnasser)]

Author: fnasser

Update of /cvs/extras/rpms/ant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32176

Modified Files:
	ant.spec 
Added Files:
	apache-ant-1.7.0-javah.patch 
Removed Files:
	apache-ant-1.6.5-javah.patch 
Log Message:
Adjust javah patch to 1.7.0 version of Ant

apache-ant-1.7.0-javah.patch:

--- NEW FILE apache-ant-1.7.0-javah.patch ---
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.original	2005-10-31 15:05:55.000000000 -0500
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2005-10-31 15:11:31.000000000 -0500
@@ -114,7 +114,7 @@
         }
         kaffeDetected = false;
         try {
-            Class.forName("kaffe.util.NotImplemented");
+            Class.forName("gnu.classpath.Configuration");
             kaffeDetected = true;
         } catch (Throwable t) {
             // swallow as this simply doesn't seem to be Kaffe
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.original	2005-10-31 15:06:34.000000000 -0500
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java	2005-10-31 15:08:13.000000000 -0500
@@ -56,7 +56,7 @@
 
     private Commandline setupKaffehCommand(Javah javah) {
         Commandline cmd = new Commandline();
-        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh"));
+        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah"));
 
         if (javah.getDestdir() != null) {
             cmd.createArgument().setValue("-d");


Index: ant.spec
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/ant.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ant.spec	27 Jul 2007 15:49:36 -0000	1.84
+++ ant.spec	27 Jul 2007 15:57:15 -0000	1.85
@@ -69,7 +69,7 @@
 # https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html
 # https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html
 # Message-ID: <432A8E37.8050101 at zarb.org>
-Patch2:         apache-ant-1.6.5-javah.patch
+Patch2:         apache-ant-1.7.0-javah.patch
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch4:         apache-ant-jars.patch
 Patch5:         apache-ant-bz163689.patch


--- apache-ant-1.6.5-javah.patch DELETED ---