[rmic-maven-plugin] Adapted to current java packaging guidelines

[spike]

commit 44c994d5940aef763f05831415a25d3364235f47
Author: spike <spike at fedoraproject.org>
Date:   Wed May 18 16:43:39 2011 +0200

    Adapted to current java packaging guidelines

 rmic-maven-plugin.spec |   64 ++++++++++++++++++-----------------------------
 1 files changed, 25 insertions(+), 39 deletions(-)
---
diff --git a/rmic-maven-plugin.spec b/rmic-maven-plugin.spec
index 7d040fa..14004e4 100644
--- a/rmic-maven-plugin.spec
+++ b/rmic-maven-plugin.spec
@@ -1,36 +1,35 @@
 Name:             rmic-maven-plugin
 Version:          1.1
-Release:          6%{?dist}
+Release:          7%{?dist}
 Summary:          Uses the java rmic compiler to generate classes used in remote method invocation
 License:          MIT
 Group:            Development/Libraries
 URL:              http://mojo.codehaus.org/%{name}
 
 Source0:          http://repo2.maven.org/maven2/org/codehaus/mojo/%{name}/%{version}/%{name}-%{version}-source-release.zip
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
 
 BuildRequires:    asm2
-BuildRequires:    groovy >= 1.5.6
+BuildRequires:    groovy
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven2 >= 2.2.1
-BuildRequires:    maven-compiler-plugin >= 2.0.2
-BuildRequires:    maven-install-plugin >= 2.2
-BuildRequires:    maven-invoker-plugin >= 1.5
-BuildRequires:    maven-jar-plugin >= 2.2
+BuildRequires:    maven
+BuildRequires:    maven-compiler-plugin
+BuildRequires:    maven-install-plugin
+BuildRequires:    maven-invoker-plugin
+BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-plugin-cobertura >= 2.2
-BuildRequires:    maven-plugin-plugin >= 2.5
-BuildRequires:    maven-resources-plugin >= 2.2
-BuildRequires:    maven-shared-invoker >= 2.0.11
-BuildRequires:    maven-surefire-maven-plugin
+BuildRequires:    maven-plugin-cobertura
+BuildRequires:    maven-plugin-plugin
+BuildRequires:    maven-resources-plugin
+BuildRequires:    maven-shared-invoker
+BuildRequires:    maven-surefire-plugin
 BuildRequires:    mojo-parent
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
-Requires:         maven2 >= 2.2.1
+Requires:         maven
 Requires:         plexus-archiver
 Requires:         plexus-compiler
 Requires:         plexus-container-default
@@ -55,22 +54,12 @@ This package contains the API documentation for %{name}.
 %setup -q
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.test.failure.ignore=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:aggregate
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
@@ -78,12 +67,9 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap org.codehaus.mojo %{name} %{version} JPP %{name}
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
-%clean
-rm -rf %{buildroot}
 
 %post
 %update_maven_depmap
@@ -92,26 +78,26 @@ rm -rf %{buildroot}
 %update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %doc License.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc License.txt
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 18 2011 Chris Spike <spike at fedoraproject.org> 1.1-7
+- Adapted to current java packaging guidelines
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Tue Oct 5 2010 Chris Spike <chris.spike at arcor.de> 1.1-5
+* Tue Oct 5 2010 Chris Spike <spike at fedoraproject.org> 1.1-5
 - Consistently using 'buildroot' macro instead of 'RPM_BUILD_ROOT' now
 
-* Thu Jul 15 2010 Chris Spike <chris.spike at arcor.de> 1.1-4
+* Thu Jul 15 2010 Chris Spike <spike at fedoraproject.org> 1.1-4
 - Set maven2.jpp.mode to true
 - Extensive use of buildroot-macro
 - Moved from Development/Tools -> Development/Libraries
@@ -120,11 +106,11 @@ rm -rf %{buildroot}
 - Removed BuildArch from javadoc subpackage
 - Added BR mojo-parent to fix FTBFS (#631167)
 
-* Mon Jul 12 2010 Chris Spike <chris.spike at arcor.de> 1.1-3
+* Mon Jul 12 2010 Chris Spike <spike at fedoraproject.org> 1.1-3
 - Changed 'Source0' to match upstream source release zip-file
 
-* Mon Jul 12 2010 Chris Spike <chris.spike at arcor.de> 1.1-2
+* Mon Jul 12 2010 Chris Spike <spike at fedoraproject.org> 1.1-2
 - Skipping tests
 
-* Fri Jul 9 2010 Chris Spike <chris.spike at arcor.de> 1.1-1
+* Fri Jul 9 2010 Chris Spike <spike at fedoraproject.org> 1.1-1
 - Initial version of the package