[plexus-interactivity] - Use javadoc:aggregate.

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Oct 6 12:48:03 UTC 2010


commit 43da73e7bf52f400028c767e9569a53a6fdc7f29
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Oct 6 15:47:41 2010 +0300

    - Use javadoc:aggregate.

 plexus-interactivity.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec
index b77f5da..fd96bee 100644
--- a/plexus-interactivity.spec
+++ b/plexus-interactivity.spec
@@ -33,7 +33,7 @@
 
 Name:           plexus-interactivity
 Version:        1.0
-Release:        0.3.a6.5%{?dist}
+Release:        0.3.a6.6%{?dist}
 Epoch:          0
 Summary:        Plexus Interactivity Handler Component
 License:        MIT
@@ -92,7 +92,7 @@ mvn-jpp \
         -Dmaven2.jpp.mode=true \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven.test.skip=true \
-        install javadoc:javadoc
+        install javadoc:aggregate
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -126,12 +126,8 @@ plexus-interactivity-jline/pom.xml \
 
 # 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-interactivity-api/target/site/apidocs/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jline
-cp -pr plexus-interactivity-jline/target/site/apidocs/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jline
+cp -pr target/site/apidocs/* \
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %clean
@@ -155,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.3.a6.6
+- Use javadoc:aggregate.
+
 * Wed Jul 21 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.3.a6.5
 - Really fix depmaps.
 


More information about the scm-commits mailing list