- up to 1.9.3

diff --git a/ant-antRun.patch b/ant-antRun.patch
index 2488390b5ea25f917db6c82393edb417e515240b..1d72345bb17d0be5133ff26045ff067de7424438 100644 (file)
--- a/ant-antRun.patch
+++ b/ant-antRun.patch
@@ -10,24 +10,4 @@ diff -ur apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Exec.java apach
                      command = antRun + " " + dir + " " + command;
                  }
              }
-diff -ur apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Execute.java apache-ant-1.6.5-antRun/src/main/org/apache/tools/ant/taskdefs/Execute.java
---- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Execute.java       2005-06-02 15:19:56.000000000 +0200
-+++ apache-ant-1.6.5-antRun/src/main/org/apache/tools/ant/taskdefs/Execute.java        2006-09-12 15:01:09.000000000 +0200
-@@ -127,7 +127,7 @@
-             }
-         } else {
-             // Generic
--            shellLauncher = new ScriptCommandLauncher("bin/antRun",
-+            shellLauncher = new ScriptCommandLauncher("antRun",
-                 new CommandLauncher());
-         }
-     }
-@@ -1038,7 +1038,7 @@
-             }
-             String antRun =
-                 FILE_UTILS.resolveFile(project.getBaseDir(),
--                        antHome + File.separator + myScript).toString();
-+                        "@BINDIR@" + File.separator + myScript).toString();
- 
-             // Build the command
-             File commandDir = workingDir;
+

diff --git a/ant.spec b/ant.spec
index beb1dc965e7a03ce74bc98ec71211bd111edfc62..5970754df03fb47396d36c582c35a95ccd287cbf 100644 (file)
--- a/ant.spec
+++ b/ant.spec
@@ -52,12 +52,12 @@ Summary(fr.UTF-8):  Outil de compilation pour java
 Summary(it.UTF-8):     Tool per la compilazione di programmi java
 Summary(pl.UTF-8):     Ant - narzędzie do budowania w Javie
 Name:          ant
-Version:       1.8.4
+Version:       1.9.3
 Release:       %{bootstrap_release %rel}
 License:       Apache
 Group:         Development/Languages/Java
 Source0:       http://www.apache.org/dist/ant/source/apache-%{name}-%{version}-src.tar.bz2
-# Source0-md5: c474fa9d0c35a24037c23b6e476862c1
+# Source0-md5: 995f21618acdf35beacc465c84d79534
 Source1:       %{name}.conf
 Patch0:                %{name}-antRun.patch