Use javadoc:aggregate to generate javadocs

xbean.spec

@@ -2,7 +2,7 @@ Name:           xbean
 Version:        3.7
 BuildArch:      noarch
 
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java plugin based web server
 
 Group:          Development/Libraries
@@ -81,7 +81,7 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mvn-jpp -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-        install javadoc:javadoc
+        install javadoc:aggregate
 
 
 %install
@@ -98,11 +98,10 @@ for sub in reflect naming classpath; do
 
     # maven depmap
     %add_to_maven_depmap org.apache.xbean %{name}-${sub} %{version} JPP/xbean %{name}-${sub}
-
-    # javadoc
-    install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/%{name}-${sub}-%{version}
-    cp -pr %{name}-${sub}/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/%{name}-${sub}-%{version}
 done
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
 ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # unversioned symlinks
@@ -138,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 30 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-3
+- Use javadoc:aggregate to generate javadocs
+
 * Fri Jul  9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-2
 - Add license to javadoc subpackage