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

[Alexander Kurtakov]

commit 0837f9156e2e3bfb01626673f16264d369c5d64c
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Fri Jun 17 02:59:43 2011 +0300

    Do not depend on maven2.

 maven-plugin-bundle.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 2d73b0f..2ec3e9d 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,6 +1,6 @@
 Name:           maven-plugin-bundle
 Version:        2.0.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Maven Bundle Plugin
 
 Group:          Development/Tools
@@ -28,7 +28,7 @@ Requires: aqute-bndlib >= 0.0.363
 Requires: plexus-utils >= 1.4.5
 Requires: felix-osgi-obr
 Requires: kxml
-Requires: maven2
+Requires: maven
 Requires: maven-archiver
 Requires: maven-shared-dependency-tree
 Requires: maven-wagon
@@ -56,12 +56,9 @@ API documentation for %{name}.
 %setup -q -n maven-bundle-plugin-%{version}
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/maven-bundle-plugin-%{version}.jar \
@@ -70,9 +67,9 @@ install -m 644 target/maven-bundle-plugin-%{version}.jar \
 %add_to_maven_depmap org.apache.felix maven-bundle-plugin %{version} JPP %{name}
 
 # poms
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
-    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
@@ -86,16 +83,17 @@ rm -rf target/site/api*
 %update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako at redhat.com> 2.0.0-10
+- Do not depend on maven2.
+
 * Thu Feb 10 2011 Alexander Kurtakov <akurtako at redhat.com> 2.0.0-9
 - BR maven-surefire-provider-junit4.