diff --git a/ant-contrib-1.0b3-enable-for-task.patch b/ant-contrib-1.0b3-enable-for-task.patch new file mode 100644 index 0000000..106bf65 --- /dev/null +++ b/ant-contrib-1.0b3-enable-for-task.patch @@ -0,0 +1,11 @@ +diff -ur ant-contrib-1.0b3.orig/src/java/net/sf/antcontrib/antcontrib.properties ant-contrib-1.0b3/src/java/net/sf/antcontrib/antcontrib.properties +--- ant-contrib-1.0b3.orig/src/java/net/sf/antcontrib/antcontrib.properties 2006-10-28 06:57:56.000000000 -0500 ++++ ant-contrib-1.0b3/src/java/net/sf/antcontrib/antcontrib.properties 2015-03-12 17:33:48.000000000 -0500 +@@ -14,6 +14,7 @@ + + # Logic tasks + if=net.sf.antcontrib.logic.IfTask ++for=net.sf.antcontrib.logic.ForTask + foreach=net.sf.antcontrib.logic.ForEach + throw=net.sf.antcontrib.logic.Throw + trycatch=net.sf.antcontrib.logic.TryCatchTask diff --git a/ant-contrib.changes b/ant-contrib.changes index f0c4b6c..1b4d9ae 100644 --- a/ant-contrib.changes +++ b/ant-contrib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 12 22:39:50 UTC 2015 - archie@dellroad.org + +- Add back the patch that enables the task + ------------------------------------------------------------------- Mon Jul 7 09:25:13 UTC 2014 - tchvatal@suse.com diff --git a/ant-contrib.spec b/ant-contrib.spec index 43bd612..412dbcd 100644 --- a/ant-contrib.spec +++ b/ant-contrib.spec @@ -1,7 +1,7 @@ # # spec file for package ant-contrib # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,7 @@ Source2: http://www.apache.org/licenses/LICENSE-2.0.txt Patch0: local-ivy.patch Patch1: ant-contrib-antservertest.patch Patch2: ant-contrib-pom.patch +Patch3: ant-contrib-1.0b3-enable-for-task.patch BuildRequires: ant >= 1.7.1 BuildRequires: apache-ivy BuildRequires: bcel >= 5.1 @@ -72,6 +73,7 @@ cp %{SOURCE2} LICENSE-2.0.txt %patch0 %patch1 %patch2 -p1 +%patch3 -p1 find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +