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 @@
-
- 4.0.0
- ant-contrib
- ant-contrib
- jar
- Ant-Contrib Tasks
- 1.0b2
- http://ant-contrib.sourceforge.net
-
- http://ant-contrib.sourceforge.net/tasks/LICENSE.txt
-
-
- https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib
-
- A collection of tasks (and at one point maybe types and other tools) for Apache Ant
-
-
- ant
- ant
- 1.5
-
-
-
\ 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 @@
+
+ 4.0.0
+ ant-contrib
+ ant-contrib
+ jar
+ Ant-Contrib Tasks
+ 1.0b3
+ http://ant-contrib.sourceforge.net
+
+
+ http://ant-contrib.sourceforge.net/tasks/LICENSE.txt
+
+
+
+ https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib
+
+ A collection of tasks (and at one point maybe types and other tools) for Apache Ant
+
+
+ org.apache.ant
+ ant
+ 1.5
+
+
+
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 @@
-
-
-
-+
-+
-
-
-@@ -349,8 +351,8 @@
-
-
-
--
--
-+
-+
-
-
-
-@@ -373,7 +375,7 @@
-
-
-
--
-+
-
-
-
-@@ -384,12 +386,18 @@
-
-
-
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-
-+ value="1.6.5" />
-
-+ value="apache-ant-${ant.download.version}-src.tar.gz" />
-+
-+
-
-
-@@ -418,7 +429,7 @@
-
-
-+ src="file://${basedir}/../../../SOURCES/${ant.src.file}">
-
-
- = 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 1.0-0.15.b3
+- Update to beta 3.
+
* Tue Nov 29 2011 Alexander Kurtakov 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 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++
+
+
+
+--- 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 @@
+
+
+
+-
+-
++
++
+
+
+-
++
+
+
+
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