From a1fb130b3cbb24866893d442d4a3fa0e2d5e057e Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Dec 15 2011 13:00:34 +0000
Subject: Update to beta 3.


---

diff --git a/.gitignore b/.gitignore
index cc5bfcc..801e988 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ant-contrib-1.0b2-src.tar.gz
+ant-contrib-1.0b3-src.tar.bz2
diff --git a/ant-contrib-1.0b2.pom b/ant-contrib-1.0b2.pom
deleted file mode 100644
index 6ec867e..0000000
--- a/ant-contrib-1.0b2.pom
+++ /dev/null
@@ -1,23 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>ant-contrib</groupId>
-  <artifactId>ant-contrib</artifactId>
-  <packaging>jar</packaging>
-  <name>Ant-Contrib Tasks</name>
-  <version>1.0b2</version>
-  <url>http://ant-contrib.sourceforge.net</url>
-  <licenses>
-    <url>http://ant-contrib.sourceforge.net/tasks/LICENSE.txt</url>
-  </licenses>
-  <scm>
-    <url>https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib</url>
-  </scm>
-  <description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
-  <dependencies>
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.5</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/ant-contrib-1.0b3.pom b/ant-contrib-1.0b3.pom
new file mode 100644
index 0000000..ca99233
--- /dev/null
+++ b/ant-contrib-1.0b3.pom
@@ -0,0 +1,25 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>ant-contrib</groupId>
+  <artifactId>ant-contrib</artifactId>
+  <packaging>jar</packaging>
+  <name>Ant-Contrib Tasks</name>
+  <version>1.0b3</version>
+  <url>http://ant-contrib.sourceforge.net</url>
+  <licenses>
+    <license>
+      <url>http://ant-contrib.sourceforge.net/tasks/LICENSE.txt</url>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib</url>
+  </scm>
+  <description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.5</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/ant-contrib-build_xml.patch b/ant-contrib-build_xml.patch
deleted file mode 100644
index 15150a5..0000000
--- a/ant-contrib-build_xml.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- build.xml.old	2006-07-20 14:29:08.000000000 -0400
-+++ build.xml	2006-07-20 14:29:35.000000000 -0400
-@@ -53,6 +53,8 @@
-   <property name="contrib.jar" location="${lib}/${jar.name}"/>
-   <property name="jar.main.class" value="net.sf.antcontrib.AntContribVersion"/>
- 
-+  <property name="bcel.jar" value="http://www.ibiblio.org/maven/bcel/jars/bcel-5.1.jar" />
-+
-   <!--
-   ######################################################
-   ### Build the class and jar file target directories
-@@ -153,7 +155,7 @@
-     <manifest file="${lib}/MANIFEST.MF">
-         <attribute name="Built-By" value="Ant-contrib"/>
-         <attribute name="Main-Class" value="${jar.main.class}"/>
--        <attribute name="Class-Path" value="${jar.name}"/>
-+        <!--<attribute name="Class-Path" value="${jar.name}"/>-->
-         <!--attribute name="Specification-Title" value="${spec.title}"/>
-         <attribute name="Specification-Version" value="${spec.version}"/>
-         <attribute name="Specification-Vendor" value="${spec.vendor}"/-->
-@@ -349,8 +351,8 @@
-       </classpath>
-     </junit>
- 
--      <fail message="JUnit error (${junit.error}) encountered." if="junit.error" />
--      <fail message="JUnit failure (${junit.failure}) encountered." if="junit.failure" />
-+<!--      <fail message="JUnit error (${junit.error}) encountered." if="junit.error" />-->
-+<!--      <fail message="JUnit failure (${junit.failure}) encountered." if="junit.failure" />-->
-   </target>
- 
-   <target name="test-all" depends="compile-tests">
-@@ -373,7 +375,7 @@
- 
-   <target name="get-jar-deps">
-       <antcall target="get-dep-maybe">
--          <param name="dep.src" value="http://www.ibiblio.org/maven/bcel/jars/bcel-5.1.jar" />
-+		  <param name="dep.src" value="${bcel.jar}" />
-           <param name="dep.dest" value="${runlib}/bcel-5.1.jar" />
-       </antcall>
- 
-@@ -384,12 +386,18 @@
-   </target>
- 
-   <target name="build-ant-testutil" unless="ant.build.testutil.available">
--    <unzip src="${build.ant.dir}/${ant.src.file}"
--             dest="${build.ant.dir}">
--          <patternset>
--              <include name="${ant.unzip.dir}/src/testcases/org/apache/tools/ant/BuildFileTest.java"/>
--          </patternset>
--    </unzip>
-+    <gunzip src="${build.ant.dir}/${ant.src.file}"
-+			dest="${build.ant.dir}" />
-+
-+    <delete file="${build.ant.dir}/${ant.src.file}" />
-+
-+    <untar src="${build.ant.dir}/${ant.src.tar.file}"
-+           dest="${build.ant.dir}" />
-+
-+    <delete file="${build.ant.dir}/${ant.src.tar.file}" />
-+    <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xml-apis.jar" />
-+    <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xercesImpl.jar" />
-+	
- 
-     <mkdir dir="${testclasses}" />
-     <javac srcdir="${build.ant.dir}/${ant.unzip.dir}/src/testcases"
-@@ -408,9 +416,12 @@
-       <property name="build.ant.dir"
-                 value="build/ant" />
-       <property name="ant.download.version"
--                value="1.6.2" />
-+                value="1.6.5" />
-       <property name="ant.src.file"
--                value="apache-ant-${ant.download.version}-src.zip" />
-+			  value="apache-ant-${ant.download.version}-src.tar.gz" />
-+	  <property name="ant.src.tar.file"
-+			  value="apache-ant-${ant.download.version}-src.tar" />
-+
-       <property name="ant.unzip.dir"
-                 value="apache-ant-${ant.download.version}" />
- 
-@@ -418,7 +429,7 @@
- 
-       <get dest="${build.ant.dir}/${ant.src.file}"
-            usetimestamp="true"
--           src="http://archive.apache.org/dist/ant/source/${ant.src.file}">
-+		   src="file://${basedir}/../../../SOURCES/${ant.src.file}">
-       </get>
- 
-       <available property="ant.build.testutil.available"
diff --git a/ant-contrib.spec b/ant-contrib.spec
index 8e4a756..dd4a5a7 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -1,15 +1,15 @@
-%global beta_number b2
+%global beta_number b3
 
 Summary:        Collection of tasks for Ant
 Name:           ant-contrib
 Version:        1.0
-Release:        0.14.%{beta_number}%{?dist}
+Release:        0.15.%{beta_number}%{?dist}
 License:        ASL 2.0
 URL:            http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries
-Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{beta_number}-src.tar.gz
-Source1:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b2/%{name}-1.0b2.pom
-Patch0:         ant-contrib-build_xml.patch
+Source0:        https://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2
+Source1:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
+Patch0:         local-ivy.patch
 Patch2:         ant-contrib-antservertest.patch
 BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  junit >= 3.8.0
@@ -17,6 +17,7 @@ BuildRequires:  ant-junit >= 1.6.2
 BuildRequires:  xerces-j2
 BuildRequires:  bcel >= 5.0
 BuildRequires:  java-devel >= 1.4.2
+BuildRequires:  apache-ivy
 Requires:       java >= 1.4.2
 Requires:       junit >= 3.8.0
 Requires:       ant >= 1.6.2
@@ -37,31 +38,26 @@ Api documentation for %{name}.
 
 %prep
 %setup -q  -n %{name}
-rm -rf test/src/net/sf/antcontrib/antclipse
-
-%patch0
+%patch0 -b .sav
 %patch2
-sed -i "s/\r//" manual/tasks/foreach.html manual/tasks/for.html
+
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
+
+sed -i "s|xercesImpl|xerces-j2|g" ivy.xml
+# needs porting to latest ivy
+rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
 
 %build
-export JUNIT_VER=`rpm -q --queryformat='%%{version}' junit`
-mkdir -p test/lib
-(cd test/lib
-ln -s $(find-jar junit-$(JUNIT_VER)) junit-$(JUNIT_VER).jar
-)
-export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=
-CLASSPATH=build/lib/ant-contrib-%{version}.jar:$CLASSPATH
-echo $ANT_HOME
-ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
+ant dist
 
 %install
 # jars
-install -Dpm 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
+install -Dpm 644 target/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
 
 # javadoc
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
 echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
@@ -76,13 +72,16 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name}.pom
 %{_javadir}/ant/*.jar
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
-%doc build/docs/LICENSE.txt
-%doc build/docs/tasks/*
+%doc target/docs/LICENSE.txt
+%doc target/docs/manual/tasks/*
 
 %files javadoc
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 15 2011 Alexander Kurtakov <akurtako@redhat.com> 1.0-0.15.b3
+- Update to beta 3.
+
 * Tue Nov 29 2011 Alexander Kurtakov <akurtako@redhat.com> 1.0-0.14.b2
 - Fix pom installed name.
 
diff --git a/local-ivy.patch b/local-ivy.patch
new file mode 100644
index 0000000..a8627e7
--- /dev/null
+++ b/local-ivy.patch
@@ -0,0 +1,43 @@
+--- build.xml.sav	2006-11-02 18:44:02.000000000 +0200
++++ build.xml	2011-12-15 13:36:38.630460824 +0200
+@@ -20,22 +20,7 @@
+ 	<property name="dist.dir" location="dist" />
+ 	<property name="target.stage.dir" location="${target.dir}/stage" />
+ 	
+-	<target name="init">
+-        <path id="ivy.lib.path">
+-            <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/>
+-            <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
+-            <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
+-            <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
+-            <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
+-            <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
+-        </path>
+-	    
+-        <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+-                 uri="antlib:fr.jayasoft.ivy.ant"
+-       	         classpathref="ivy.lib.path"/>
+-	</target>
+-	
+-	<target name="configure" depends="init">
++	<target name="configure" >
+ 		<ivy:configure file="ivy-conf.xml" />
+     </target>
+ 		
+--- ivy-conf.xml.sav	2006-10-28 14:57:58.000000000 +0300
++++ ivy-conf.xml	2011-12-15 14:35:15.155840710 +0200
+@@ -5,11 +5,11 @@
+   
+   <resolvers>
+       <filesystem name="local">
+-          <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
+-          <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
++          <ivy pattern="${ivy.conf.dir}/lib/[module]/apache-ivy-[revision].xml" />
++          <artifact pattern="/usr/share/java/[artifact].[ext]" />
+       </filesystem>
+           
+-      <ivyrep name="ivyrep" />
++      <ivyrep name="ivyrep" ivyroot="."/>
+ 
+       <chain name="default-resolver">
+           <resolver ref="local" />
diff --git a/sources b/sources
index d10ff97..f90fedb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66511dddcef3dc9798db33dbaca0d3de  ant-contrib-1.0b2-src.tar.gz
+9e3d70fe9318af743262f3ddba4e9449  ant-contrib-1.0b3-src.tar.bz2