[piccolo2d] - Fix FTBFS - javadoc:aggregate.

[Alexander Kurtakov]

commit b8d4bec5c5c6f3152a74a7958c904ff9df83d547
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Sat Sep 11 02:39:35 2010 +0300

    - Fix FTBFS - javadoc:aggregate.

 piccolo2d.spec |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/piccolo2d.spec b/piccolo2d.spec
index a8b9e47..fd710ce 100644
--- a/piccolo2d.spec
+++ b/piccolo2d.spec
@@ -1,6 +1,6 @@
 Name:           piccolo2d
 Version:        1.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Structured 2D graphics toolkit
 
 Group:          Development/Libraries
@@ -11,13 +11,14 @@ Source0:        http://piccolo2d.googlecode.com/files/%{name}-%{version}-src.tar
 Source2:        %{name}-settings.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-install 
-BuildRequires:  maven2-plugin-compiler 
-BuildRequires:  maven2-plugin-javadoc 
-BuildRequires:  maven2-plugin-jar 
-BuildRequires:  maven2-plugin-resources 
-BuildRequires:  maven-surefire-maven-plugin 
+BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-site-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-surefire-plugin 
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  java-devel >= 1:1.6.0
@@ -41,7 +42,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n piccolo2d-%{version}-src
-
+sed -i -e "s|\[3\.3\.0-v3346\,)|3\.3\.0-v3346|g" swt/pom.xml
 mkdir -p .m2/repository/org.eclipse.swt.gtk.linux/
 ln -s %{_libdir}/java/swt.jar .m2/repository/org.eclipse.swt.gtk.linux/x86.jar  
 ln -s %{_libdir}/java/swt.jar .m2/repository/org.eclipse.swt.gtk.linux/x86_64.jar 
@@ -62,7 +63,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 %{buildroot}
@@ -94,12 +95,7 @@ install -pm 644 swt/pom.xml \
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/core
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/extras
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/swt
-cp -pr core/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/core
-cp -pr extras/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/extras
-cp -pr swt/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/swt
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
 %post
@@ -114,7 +110,7 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 %files
 %defattr(-,root,root,-)
 %{_javadir}/%{name}
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %doc license-piccolo.txt 
 
@@ -122,8 +118,12 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
+%doc license-piccolo.txt 
 
 %changelog
+* Sat Sep 11 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3-6
+- Fix FTBFS - javadoc:aggregate.
+
 * Fri May 14 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3-5
 - Create both x86 and x86_64 symlinks to allow properly building the package as noarch.