[maven-assembly-plugin] Add missing BR/R.

[Alexander Kurtakov]

commit 8298a219c16a6145a0884d52fb7a644d5a0e9be2
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Sun Oct 2 13:53:24 2011 +0300

    Add missing BR/R.

 maven-assembly-plugin-jpp-depmap.xml |    9 ---------
 maven-assembly-plugin.spec           |   17 ++++++++++-------
 2 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 009dd92..6820f32 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,13 +1,12 @@
 Name:           maven-assembly-plugin
 Version:        2.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven Assembly Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Source1:        %{name}-jpp-depmap.xml
 
 Patch0:         %{name}-migration-to-component-metadata.patch
 
@@ -30,7 +29,6 @@ BuildRequires:  maven-plugin-plugin
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-shared-filtering
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 
@@ -45,6 +43,8 @@ BuildRequires: plexus-archiver
 BuildRequires: maven-shared-file-management
 BuildRequires: maven-shared-repository-builder
 BuildRequires: maven-shared-filtering
+BuildRequires: maven-shared-file-management
+BuildRequires: maven-shared-io
 
 BuildRequires: easymock
 BuildRequires: jdom
@@ -67,6 +67,8 @@ Requires: plexus-interpolation
 Requires: plexus-archiver
 Requires: maven-shared-repository-builder
 Requires: maven-shared-filtering
+Requires: maven-shared-file-management
+Requires: maven-shared-io
 
 Requires:          jpackage-utils >= 0:1.7.2
 Requires(post):    jpackage-utils >= 0:1.7.2
@@ -96,8 +98,6 @@ cp -pr src/main/resources/META-INF/ target/classes/
 %build
 # seems koji don't have easymockclassextension
 mvn-rpmbuild \
-        -e \
-        -Dmaven.local.depmap.file=%{SOURCE1} \
         -Dmaven.test.skip=true \
         install javadoc:aggregate
 
@@ -108,13 +108,13 @@ mvn-rpmbuild \
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.apache.maven.plugins maven-assembly-plugin %{version} JPP maven-assembly-plugin
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
@@ -129,6 +129,9 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Sun Oct 2 2011 Alexander Kurtakov <akurtako at redhat.com> 2.2.1-4
+- Add missing BR/R.
+
 * Thu Jul 15 2011 Jaromir Capik <jcapik at redhat.com> 2.2.1-3
 - modello removed from requires
 - %update_maven_depmap removed