rpms/ant/devel apache-ant-1.6.5-javah.patch, 1.2, 1.3 apache-ant-1.6.5-rpm.patch, 1.2, 1.3

[Fernando Nasser (fnasser)]

Author: fnasser

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

Added Files:
	apache-ant-1.6.5-javah.patch apache-ant-1.6.5-rpm.patch 
Log Message:
Re-add Fedora patches that may still be necessary


apache-ant-1.6.5-javah.patch:

Index: apache-ant-1.6.5-javah.patch
===================================================================
RCS file: apache-ant-1.6.5-javah.patch
diff -N apache-ant-1.6.5-javah.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ apache-ant-1.6.5-javah.patch	27 Jul 2007 15:04:51 -0000	1.3
@@ -0,0 +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
+@@ -104,7 +104,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
+@@ -52,7 +52,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");

apache-ant-1.6.5-rpm.patch:

Index: apache-ant-1.6.5-rpm.patch
===================================================================
RCS file: apache-ant-1.6.5-rpm.patch
diff -N apache-ant-1.6.5-rpm.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ apache-ant-1.6.5-rpm.patch	27 Jul 2007 15:04:51 -0000	1.3
@@ -0,0 +1,31 @@
+--- apache-ant-1.6.5/src/script/ant.original	2005-10-27 17:06:55.000000000 -0400
++++ apache-ant-1.6.5/src/script/ant	2005-10-27 17:08:45.000000000 -0400
+@@ -150,6 +150,28 @@
+ # variable
+ if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
+   LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
++
++  # If no optional jars have been specified then build the default list
++  if [ -z "$OPT_JAR_LIST" ] ; then
++    for file in /etc/ant.d/*; do
++      if [ -f "$file" ]; then
++        case "$file" in
++        *~) ;;
++        *#*) ;;
++        *.rpmsave) ;;
++        *.rpmnew) ;;
++        *)
++          for dep in `cat "$file"`; do
++            case "$OPT_JAR_LIST" in
++            *"$dep"*) ;;
++            *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
++            esac
++          done
++        esac
++      fi
++    done
++  fi
++
+   # If the user requested to try to add some other jars to the classpath
+   if [ -n "$OPT_JAR_LIST" ] ; then
+     _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"