[maven-ant-tasks/f19] Fix FTBFS rhbz #914164

[mbooth]

commit ca3ba949780d2012d2b3c9cafef84e88aee30a6c
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Tue Mar 19 12:36:54 2013 +0000

    Fix FTBFS rhbz #914164

 maven-ant-tasks.spec |   48 +++++++++++++++---------------------------------
 1 files changed, 15 insertions(+), 33 deletions(-)
---
diff --git a/maven-ant-tasks.spec b/maven-ant-tasks.spec
index b913230..a3b524a 100644
--- a/maven-ant-tasks.spec
+++ b/maven-ant-tasks.spec
@@ -1,6 +1,6 @@
 Name:           maven-ant-tasks
 Version:        2.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Allow Maven artifact handling features to be used from within an Ant build
 
 Group:          Development/Libraries
@@ -17,8 +17,7 @@ BuildArch:      noarch
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  ant >= 1.8.0
-# maven-ant-tasks explicitly needs maven2
-BuildRequires:  maven2
+BuildRequires:  maven-local
 BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-install-plugin
@@ -27,18 +26,14 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-shade-plugin
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-error-diagnostics
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-interpolation
 
 Requires:       jpackage-utils
-
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
-
 Requires:       java
 Requires:       ant >= 1.8.0
-Requires:       maven2
+Requires:       maven
 Requires:       maven-error-diagnostics
 
 %description
@@ -75,17 +70,15 @@ done
 
 
 %build
-#We need to use their local repo becase we can't override it
-export MAVEN_REPO_LOCAL=$(pwd)/target/local-repo
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-        install javadoc:javadoc
+# Skip tests because they fail with maven 3, see upstream bug:
+# http://jira.codehaus.org/browse/MANTTASKS-165
+mvn-rpmbuild \
+   -Dmaven.local.depmap.file="%{SOURCE1}" \
+   -Dmaven.test.skip=true \
+   install javadoc:javadoc
 
 
 %install
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p target/original-%{name}-%{version}.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
@@ -98,35 +91,24 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml \
         $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
-
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 
 %files
-%defattr(-,root,root,-)
 %doc DEPENDENCIES LICENSE NOTICE README.txt
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %{_javadir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc LICENSE
+%doc LICENSE NOTICE
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Mar 19 2013 Mat Booth <fedora at matbooth.co.uk> - 2.1.3-4
+- Fix FTBFS rhbz #914164
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild