rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust javah patch to 1.7.0 version of Ant

Browse Source
This commit is contained in:
Fernando Nasser 2007-07-27 15:57:15 +00:00
parent 3b03f90c73
commit b663f31a6e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ant.spec
View File

@ -69,7 +69,7 @@ Source2: apache-ant-%{major_version}.ant.conf
# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html # https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html
# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html # https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html
# Message-ID: <432A8E37.8050101@zarb.org> # Message-ID: <432A8E37.8050101@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 # Fix some places where copies of classes are included in the wrong jarfiles
Patch4: apache-ant-jars.patch Patch4: apache-ant-jars.patch
Patch5: apache-ant-bz163689.patch Patch5: apache-ant-bz163689.patch

4
apache-ant-1.6.5-javah.patch → apache-ant-1.7.0-javah.patch
View File

@ -1,6 +1,6 @@
--- 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.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 +++ 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 @@ @@ -114,7 +114,7 @@
} }
kaffeDetected = false; kaffeDetected = false;
try { try {
@ -11,7 +11,7 @@
// swallow as this simply doesn't seem to be Kaffe // 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.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 +++ 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 @@ @@ -56,7 +56,7 @@
private Commandline setupKaffehCommand(Javah javah) { private Commandline setupKaffehCommand(Javah javah) {
Commandline cmd = new Commandline(); Commandline cmd = new Commandline();