rpms/ant/devel ant.spec, 1.85, 1.86 apache-ant-1.7.0-javah.patch, 1.1, 1.2

[Fernando Nasser (fnasser)]

Author: fnasser

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

Modified Files:
	ant.spec apache-ant-1.7.0-javah.patch 
Log Message:
Adjust javah patch


Index: ant.spec
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/ant.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ant.spec	27 Jul 2007 15:57:15 -0000	1.85
+++ ant.spec	27 Jul 2007 17:02:27 -0000	1.86
@@ -606,7 +606,7 @@
 %setup -q -n apache-ant-%{cvs_version}
 
 # #157750: make the javah task work with java-gcj-compat
-%patch2 -p1
+%patch2 -p0
 
 # Fix some places where copies of classes are included in the wrong jarfiles
 %patch4 -p1 -b .orig

apache-ant-1.7.0-javah.patch:

Index: apache-ant-1.7.0-javah.patch
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/apache-ant-1.7.0-javah.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apache-ant-1.7.0-javah.patch	27 Jul 2007 15:57:15 -0000	1.1
+++ apache-ant-1.7.0-javah.patch	27 Jul 2007 17:02:27 -0000	1.2
@@ -1,22 +1,22 @@
---- 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
+--- src/main/org/apache/tools/ant/util/JavaEnvUtils.java.orig	2006-12-13 07:16:19.000000000 -0500
++++ src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2007-07-27 12:59:04.000000000 -0400
 @@ -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
+         }
+         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
+--- src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.orig	2006-12-13 07:16:22.000000000 -0500
++++ src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java	2007-07-27 13:00:51.000000000 -0400
 @@ -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");
+ 
+     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");