Add spice-parent to Requires

- Fixes according to new guidelines
- Versionless jars & javadocs
- Use maven3 to build

plexus-sec-dispatcher.spec

@@ -1,17 +1,16 @@
 Name:           plexus-sec-dispatcher
 Version:        1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plexus Security Dispatcher Component
 
 Group:          Development/Libraries
-License:        ASL 2.0 
+License:        ASL 2.0
 URL:            http://spice.sonatype.org
 #svn export http://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.4/
 #tar jcf plexus-sec-dispatcher-1.4.tar.bz2 plexus-sec-dispatcher-1.4/
 Source0:        %{name}-%{version}.tar.bz2
 #Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4.
 Patch0:        %{name}-pom.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
@@ -34,6 +33,7 @@ BuildRequires: maven-surefire-provider-junit
 
 Requires:       jpackage-utils
 Requires:       java
+Requires:       spice-parent
 
 Requires(post):       jpackage-utils
 Requires(postun):     jpackage-utils
@@ -51,36 +51,29 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p0
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mvn-rpmbuild install javadoc:javadoc
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
-install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/plexus/%{name}-%{version}.jar
+install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/plexus/%{name}.jar
-
-(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-%add_to_maven_depmap org.sonatype.plexus %{name} %{version} JPP/plexus %{name}
 
 # poms
 install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
 
+%add_maven_depmap JPP.plexus-%{name}.pom plexus/%{name}.jar
+
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}
+install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}/
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/plexus/%{name}
+
-rm -rf target/site/api*
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %post
 %update_maven_depmap
@@ -88,21 +81,21 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/plexus/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/plexus/%{name}-%{version}
 %{_javadocdir}/plexus/%{name}
 
 %changelog
+* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4-4
+- Fixes according to new guidelines
+- Add spice-parent to Requires
+- Versionless jars & javadocs
+- Use maven3 to build
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -110,4 +103,4 @@ rm -rf %{buildroot}
 - Fixed url
 
 * Fri May 21 2010 Hui Wang <huwang@redhat.com> - 1.4-1
-- Initial version of the package
+- Initial version of the package