From fcd2adde038f8fbbd1bc51bca2056aa575387dc7 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 8 Jun 2011 13:33:37 +0300
Subject: [PATCH] Build with maven 3.x.

---
 maven-antrun-plugin.spec | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec
index 2385089..c8350dc 100644
--- a/maven-antrun-plugin.spec
+++ b/maven-antrun-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-antrun-plugin
 Version:        1.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven AntRun Plugin
 
 Group:          Development/Libraries
@@ -9,14 +9,13 @@ URL:            http://maven.apache.org/plugins/maven-antrun-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip 
 Patch0:         fix-deps.patch
 Patch1:         fix-ant-1.8.2.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
 BuildRequires: ant
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-plugin-plugin
@@ -26,7 +25,7 @@ BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 Requires: ant
-Requires: maven2
+Requires: maven
 Requires: jpackage-utils
 Requires: java
 Requires(post): jpackage-utils
@@ -53,16 +52,9 @@ API documentation for %{name}.
 %patch1
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
@@ -75,10 +67,8 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -86,23 +76,20 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE NOTICE
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jun 8 2011 Alexander Kurtakov <akurtako@redhat.com> 1.6-4
+- Build with maven 3.x.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild