[maven-jxr] Fix build bug (javadoc:aggregate)

[Stanislav Ochotnicky]

commit 61d3731632bffe87005983510460cd688459652d
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Sep 8 11:12:53 2010 +0200

    Fix build bug (javadoc:aggregate)

 maven-jxr.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/maven-jxr.spec b/maven-jxr.spec
index d7f21ce..900e0d2 100644
--- a/maven-jxr.spec
+++ b/maven-jxr.spec
@@ -32,7 +32,7 @@
 
 Name:           maven-jxr
 Version:        2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        ASL 2.0
@@ -123,13 +123,15 @@ mkdir -p $MAVEN_REPO_LOCAL
 # The test failures seem to have something to do with:
 # http://jira.codehaus.org/browse/MCHANGES-88
 # We can investigate when we upgrade to 2.2.x to see if they still occur.
+# Update: Seems that tests fail because they are trying to access
+# plexus component descriptors which seem to be different?
 %if %{with_maven}
     mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven2-jpp.depmap.file=%{SOURCE1} \
         -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+        install javadoc:aggregate
 %else
 
 # Only build maven-jxr and not the plugin so we can bootstrap maven
@@ -165,14 +167,14 @@ install -pm 644 maven-jxr/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{
 %add_to_maven_depmap org.apache.maven.plugins maven-jxr-plugin %{version} JPP maven-plugin-jxr
 install -pm 644 maven-jxr-plugin/target/maven-jxr-plugin-%{version}.jar \
                 $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr-%{version}.jar
-                
+
 install -pm 644 maven-jxr-plugin/pom.xml \
         $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-plugin-jxr.pom
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-cp -pr maven-jxr/target/site/apidocs/* \
+cp -pr target/site/apidocs/* \
                 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -215,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep  7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:2.1-7
+- Fix build bug (javadoc:aggregate)
+
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-6
 - Install maven-jxr parent pom.
 
@@ -273,7 +278,7 @@ rm -rf $RPM_BUILD_ROOT
 - Removed period from %%Summary.
 - Removed %%Vendor.
 - Removed %%Distribution.
-- Removed %%post and %%postun sections for javadoc. 
+- Removed %%post and %%postun sections for javadoc.
 - Added gcj support option.
 - Fixed instructions on how to generate source drops.