[java-sig-commits] [maven-war-plugin] Do not depend on maven2.

[Alexander Kurtakov]

commit 745e2cdd4eadcbefeb478906b02f6dd2b53fc9ef
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Fri Jun 17 02:52:58 2011 +0300

    Do not depend on maven2.

 maven-war-plugin.spec |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/maven-war-plugin.spec b/maven-war-plugin.spec
index f452a9f..dd2b810 100644
--- a/maven-war-plugin.spec
+++ b/maven-war-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-war-plugin
 Version:        2.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven WAR Plugin
 
 Group:          Development/Libraries
@@ -36,7 +36,7 @@ BuildRequires: maven-invoker-plugin
 BuildRequires: xstream
 
 Requires: java
-Requires: maven2
+Requires: maven
 Requires: xstream
 Requires: jpackage-utils
 Requires(post): jpackage-utils
@@ -61,11 +61,7 @@ API documentation for %{name}.
 %setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
-mvn-local -e \
-        -Dmaven.test.skip=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 %install
@@ -81,10 +77,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
@@ -93,17 +87,17 @@ rm -rf target/site/api*
 %update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako at redhat.com> 2.1.1-4
+- Do not depend on maven2.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild