[plexus-velocity] plexus-maven-plugin removed (not needed)

[Alexander Kurtakov]

commit 5d0872217a30eca7c677e861fda88a864d3e0916
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Thu Jul 28 15:36:53 2011 +0200

    plexus-maven-plugin removed (not needed)

 plexus-velocity.spec |   62 +++++++++++++++++---------------------------------
 1 files changed, 21 insertions(+), 41 deletions(-)
---
diff --git a/plexus-velocity.spec b/plexus-velocity.spec
index eb20c25..158fb6a 100644
--- a/plexus-velocity.spec
+++ b/plexus-velocity.spec
@@ -40,7 +40,7 @@
 
 Name:           plexus-velocity
 Version:        1.1.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
@@ -51,20 +51,17 @@ URL:            http://plexus.codehaus.org/
 Source0:        plexus-velocity-%{version}-src.tar.gz
 Source1:        plexus-velocity-1.1.7-build.xml
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  java-devel >= 1.6.0
 %if %{with_maven}
-BuildRequires:  maven2 >= 2.0.4-10jpp
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  plexus-maven-plugin
+BuildRequires:  maven
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia-sitetools
@@ -81,8 +78,6 @@ Requires:  jakarta-commons-collections
 Requires:  plexus-container-default
 Requires:  plexus-utils
 Requires:  velocity
-Requires(post):    jpackage-utils >= 0:1.7.2
-Requires(postun):  jpackage-utils >= 0:1.7.2
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -116,10 +111,10 @@ ln -s %{_javadir} external_repo/JPP
 %if %{with_maven}
     # Use normal pom for now
     rm -f release-pom.xml
-    mvn-jpp \
+    mvn-rpmbuild \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+        install javadoc:aggregate
 %else
 
 mkdir -p target/lib
@@ -136,51 +131,36 @@ ant jar javadoc
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/velocity-%{version}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
-
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
-do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar \
+   %{buildroot}/%{_javadir}/%{parent}/%{subname}.jar
 
 # poms
 %if %{with_maven}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
+%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
 %endif
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{parent}
 %{_mavendepmapfragdir}
 %if %{with_maven}
-%{_datadir}/maven2
+%{_mavenpomdir}/*
 %endif
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Jul 28 2011 Jaromir Capik <jcapik at redhat.com> - 0:1.1.8-7
+- Migration to maven3
+- Removal of plexus-maven-plugin (not needed)
+- Minor spec file changes according to the latest guidelines
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild