[maven-archiver] Build with maven 3.x.

[Alexander Kurtakov]

commit 59d2efa468518ca3dae16e12ea4ad536472a3a7b
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Jun 8 13:44:10 2011 +0300

     Build with maven 3.x.

 maven-archiver.spec |   39 ++++++++++++---------------------------
 1 files changed, 12 insertions(+), 27 deletions(-)
---
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 4d92cc9..3064f39 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -30,7 +30,7 @@
 
 Name:           maven-archiver
 Version:        2.4.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Maven Archiver
 License:        ASL 2.0
@@ -41,13 +41,12 @@ URL:            http://maven.apache.org/
 # tar caf maven-archiver-2.4.1-src.tar.xz maven-archiver/
 Source0:        %{name}-%{version}-src.tar.xz
 Source1:        %{name}-depmap.xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  maven2 >= 0:2.0.8
+BuildRequires:  maven
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
@@ -63,7 +62,7 @@ BuildRequires:  plexus-archiver >= 1.0-0.1.a7
 BuildRequires:  plexus-utils
 BuildRequires:  apache-commons-parent
 
-Requires:       maven2 >= 0:2.0.4-9
+Requires:       maven
 Requires:       plexus-archiver >= 1.0-0.1.a7
 Requires:       plexus-interpolation
 Requires:       plexus-utils
@@ -92,28 +91,17 @@ Javadoc for %{name}.
 rm -fr src/test/java/org/apache/maven/archiver/*.java
 
 %build
-
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
-    -e \
-    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-    -Dmaven.test.failure.ignore=true \
-    -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-    install javadoc:javadoc
+mvn-rpmbuild install javadoc:aggregate
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars/poms
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 
 # Copy file and create unversioned symlink
 install -pm 644 target/%{name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # Copy pom
 install -pm 644 pom.xml \
@@ -121,24 +109,21 @@ install -pm 644 pom.xml \
 %add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP maven-archiver
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
-%{_datadir}/maven2/poms/JPP-maven-archiver.pom
+%{_mavenpomdir}/JPP-maven-archiver.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Jun 8 2011 Alexander Kurtakov <akurtako at redhat.com> 0:2.4.1-6
+- Build with maven 3.x.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild