[plexus-mail-sender] Fix up according to latest guidelines

[Stanislav Ochotnicky]

commit 17d0cf5b333dc2ac25099b6ea48b30a1252346f6
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Dec 7 18:43:18 2011 +0100

    Fix up according to latest guidelines

 plexus-mail-sender.spec |   33 ++++++++++++---------------------
 1 files changed, 12 insertions(+), 21 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index 004a22d..e9be8c9 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
 
 Name:           plexus-mail-sender
 Version:        1.0
-Release:        0.a2.19%{?dist}
+Release:        0.a2.20%{?dist}
 Epoch:          0
 Summary:        Plexus Mail Sender
 License:        MIT and ASL 1.1
@@ -65,10 +65,11 @@ BuildRequires:  saxon
 BuildRequires:  saxon-scripts
 BuildRequires:  java-devel >= 1:1.6.0
 
+# just one-off remove during next rebuild!
+BUildRequires:  plexus-mail-sender
+
 Requires:       java
 Requires:       jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun):jpackage-utils
 
 BuildArch:      noarch
 
@@ -92,15 +93,11 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}-a2
-
 %patch0 -p3
-# fix groupIds of plexus to org.codehaus.plexus
-# mainly to
-find . -name release-pom.xml -exec \
-     sed -i 's:<groupId>plexus</groupId>:<groupId>org.codehaus.plexus</groupId>:' \{\} \;
 
 %build
 mvn-rpmbuild \
+        -Dmaven.local.debug=true \
         -Dmaven.local.depmap.file="%{SOURCE2}" \
         -Dmaven.test.skip=true \
         install javadoc:aggregate
@@ -115,8 +112,7 @@ for mod in javamail simple test;do
     install -pm 644 target/%{name}-$mod-%{namedversion}.jar \
             $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-$mod.jar
     install -pm 644 release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-$mod.pom
-    %add_to_maven_depmap org.codehaus.plexus %{name}-$mod %{version} JPP/plexus mail-sender-$mod
-    %add_to_maven_depmap plexus %{name}-$mod %{version} JPP/plexus mail-sender-$mod
+    %add_maven_depmap JPP.%{name}-$mod.pom plexus/mail-sender-$mod.jar -a "org.codehaus.plexus:plexus-mail-sendser-$mod"
     popd
 done
 popd
@@ -125,8 +121,7 @@ install -pm 644 \
   %{name}-api/target/%{name}-api-%{namedversion}.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api.jar
 install -pm 644 %{name}-api/release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-api.pom
-%add_to_maven_depmap org.codehaus.plexus %{name}-api %{version} JPP/plexus mail-sender-api
-%add_to_maven_depmap plexus %{name}-api %{version} JPP/plexus mail-sender-api
+%add_maven_depmap JPP.%{name}-api.pom plexus/mail-sender-api.jar
 
 
 # javadoc
@@ -134,22 +129,18 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-
 %files
 %{_mavendepmapfragdir}/%{name}
 %{_mavenpomdir}/*pom
-%{_javadir}/*
+%{_javadir}/plexus/*jar
 
 %files javadoc
-%{_javadocdir}/*
+%{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 7 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.a2.20
+- Fix up according to latest guidelines
+
 * Sun Jun 12 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.a2.19
 - Build with maven 3.x