[java-sig-commits] [plexus-mail-sender] Fix FTBFS.

[Alexander Kurtakov]

commit ba3329c5a59cde8b168462a7dc3e18d6a8259a4a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Dec 13 17:05:28 2010 +0200

    Fix FTBFS.
    
    Adapt to current guidelines.

 plexus-mail-sender.spec |   46 ++++++++++++++++------------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index 7fa390c..f9d5038 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.15%{?dist}
+Release:        0.a2.16%{?dist}
 Epoch:          0
 Summary:        Plexus Mail Sender
 License:        MIT and ASL 1.1
@@ -83,6 +83,7 @@ Plexus component provides SMTP transport.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -93,10 +94,6 @@ Javadoc for %{name}.
 %patch0 -p3
 
 %build
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
@@ -105,7 +102,7 @@ mvn-jpp \
         -Dmaven2.jpp.depmap.file="%{SOURCE2}" \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven.test.skip=true \
-        install javadoc:javadoc
+        install javadoc:aggregate
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -113,36 +110,21 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 \
   plexus-mail-senders/plexus-mail-sender-javamail/target/%{name}-javamail-%{namedversion}-SNAPSHOT.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-javamail-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-javamail.jar
 install -pm 644 \
   plexus-mail-senders/plexus-mail-sender-simple/target/%{name}-simple-%{namedversion}-SNAPSHOT.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-simple-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-simple.jar
 install -pm 644 \
   plexus-mail-senders/plexus-mail-sender-test/target/%{name}-test-%{namedversion}-SNAPSHOT.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-test-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-test.jar
 install -pm 644 \
   plexus-mail-sender-api/target/%{name}-api-%{namedversion}-SNAPSHOT.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do \
-  ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api.jar
+
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-cp -pr plexus-mail-sender-api/target/site/apidocs/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/test
-cp -pr plexus-mail-senders/plexus-mail-sender-test/target/site/apidocs/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/test
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/simple
-cp -pr plexus-mail-senders/plexus-mail-sender-simple/target/site/apidocs/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/simple
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/javamail
-cp -pr plexus-mail-senders/plexus-mail-sender-javamail/target/site/apidocs/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/javamail
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* \
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %defattr(-,root,root,-)
@@ -150,9 +132,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%{_javadocdir}/*
 
 %changelog
+* Mon Dec 13 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.a2.16
+- Fix FTBFS.
+- Adapt to current guidelines.
+
 * Wed Sep  8 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.a2.15
 - Add maven-site-plugin to BR
 - Update maven-plugin BR names