[maven-one-plugin/f16] Packaging fixes

[Stanislav Ochotnicky]

commit fde3290c75bae446353b2679f814a353368e2512
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Fri Dec 2 13:43:13 2011 +0100

    Packaging fixes
    
    - Use new macros
    - Fix build with maven-compat patch

 maven-one-plugin.spec |   36 +++++++++++++++++-------------------
 1 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/maven-one-plugin.spec b/maven-one-plugin.spec
index 2267c4a..40eae7d 100644
--- a/maven-one-plugin.spec
+++ b/maven-one-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-one-plugin
 Version:        1.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Plugin provides some integration tasks with Maven 1.x
 
 Group:          Development/Libraries
@@ -34,33 +34,31 @@ Requires: maven
 Requires: maven-shared-model-converter
 Requires: jpackage-utils
 Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils 
 
 Obsoletes: maven2-plugin-one <= 0:2.0.8
 Provides: maven2-plugin-one = 1:%{version}-%{release}
 
 %description
 This plugin provides some integration tasks with Maven 1.x:
-* Helps you to switch your project from Maven 1 to Maven 2 by 
+* Helps you to switch your project from Maven 1 to Maven 2 by
 converting your project.xml to a pom.xml
-* Provides a packaging mechanism for Maven 1.x plugins, 
+* Provides a packaging mechanism for Maven 1.x plugins,
 building them using Maven 2.0
-* Provides a hook for installation that will copy built artifacts 
-into a local or remote Maven 1.x repository, for concurrent development with 
+* Provides a hook for installation that will copy built artifacts
+into a local or remote Maven 1.x repository, for concurrent development with
 Maven 1.x projects
 
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires: jpackage-utils
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 
 %build
@@ -73,32 +71,32 @@ 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 %{name} %{version} JPP %{name}
 
 # 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}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Dec  2 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.2-7
+- Packaging fixes
+- Use new macros
+- Fix build with maven-compat patch
+
 * Thu Jun 9 2011 Alexander Kurtakov <akurtako at redhat.com> 1.2-6
 - Build with maven 3.x.
 - Guidelines fixes.