[ant-contrib] Build using XMvn Ivy resolver

[Mikolaj Izdebski]

commit edfdcb1f23f5b373ad8ae8b9582b8ca71f108705
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Aug 11 14:38:53 2014 +0200

    Build using XMvn Ivy resolver

 ant-contrib-pom.patch |   13 -----------
 ant-contrib.spec      |   54 ++++++++++++++++++++-----------------------------
 local-ivy.patch       |   43 ---------------------------------------
 3 files changed, 22 insertions(+), 88 deletions(-)
---
diff --git a/ant-contrib.spec b/ant-contrib.spec
index 4e6cd76..80d22cf 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -3,28 +3,24 @@
 Summary:        Collection of tasks for Ant
 Name:           ant-contrib
 Version:        1.0
-Release:        0.25.%{beta_number}%{?dist}
+Release:        0.26.%{beta_number}%{?dist}
 License:        ASL 2.0 and ASL 1.1
 URL:            http://ant-contrib.sourceforge.net/
-Group:          Development/Libraries
 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
 # ASL 2.0 Licence text
 # Upstream bug at https://sourceforge.net/tracker/?func=detail&aid=3590371&group_id=36177&atid=416920
 Source2:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0:         local-ivy.patch
 Patch2:         %{name}-antservertest.patch
-Patch3:         %{name}-pom.patch
-BuildRequires:  jpackage-utils >= 1.5
-BuildRequires:  junit >= 3.8.0
-BuildRequires:  ant-junit >= 1.6.2
+BuildRequires:  ivy-local
+BuildRequires:  junit
+BuildRequires:  ant-junit
 BuildRequires:  xerces-j2
-BuildRequires:  bcel >= 5.0
-BuildRequires:  java-devel >= 1.4.2
+BuildRequires:  bcel
+BuildRequires:  java-devel
 BuildRequires:  apache-ivy
-Requires:       java-headless >= 1.4.2
-Requires:       junit >= 3.8.0
-Requires:       ant >= 1.6.2
+Requires:       java-headless
+Requires:       junit
+Requires:       ant
 Requires:       xerces-j2
 BuildArch:      noarch
 
@@ -43,12 +39,8 @@ Api documentation for %{name}.
 
 %prep
 %setup -q  -n %{name}
-%patch0 -b .sav
 %patch2
 
-cp %{SOURCE1} %{name}-1.0b3.pom
-%patch3 -p1
-
 cp %{SOURCE2} LICENSE-2.0.txt
 
 find -name '*.class' -exec rm -f '{}' \;
@@ -58,36 +50,34 @@ sed -i "s|xercesImpl|xerces-j2|g" ivy.xml
 # needs porting to latest ivy
 rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
 
+sed -i '/<ivy:configure /d' build.xml
+rm -f ivy-conf.xml
+
+sed -i '/<info /s//&revision="1.0b3" /' ivy.xml
+%mvn_alias : ant-contrib:
+
 %build
-ant dist
+%ant -Divy.mode=local dist
 
 %install
-# jars
-install -Dpm 644 target/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
-
-# javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_artifact ivy.xml target/%{name}.jar
+%mvn_install -J target/docs/api
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
 echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{name}-1.0b3.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name}.pom
-
-%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
-
 %files -f .mfiles
 %{_sysconfdir}/ant.d/ant-contrib
-%{_javadir}/ant/*.jar
 %doc target/docs/LICENSE.txt LICENSE-2.0.txt
 %doc target/docs/manual/tasks/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc target/docs/LICENSE.txt LICENSE-2.0.txt
-%doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 11 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0-0.26.b3
+- Build using XMvn Ivy resolver
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.25.b3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild