[java-sig-commits] [plexus-cipher] Do not require maven2.

[Alexander Kurtakov]

commit 0b4765c6c2307a2ed63246cdbd26e3c345983317
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Jun 3 15:57:09 2011 +0300

    Do not require maven2.
    
    Build with maven (v. 3) by default.
    Drop obsoleted parts of the spec.

 plexus-cipher.spec |   46 +++++++++++++++++-----------------------------
 1 files changed, 17 insertions(+), 29 deletions(-)
---
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 61c90b1..2795175 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,6 +1,6 @@
 Name:           plexus-cipher
 Version:        1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plexus Cipher: encryption/decryption Component
 
 Group:          Development/Libraries
@@ -9,19 +9,18 @@ URL:            http://spice.sonatype.org
 #svn export http://svn.sonatype.org/spice/tags/plexus-cipher-1.5
 #tar zcf plexus-cipher-1.5.tar.gz plexus-cipher-1.5
 Source0:        %{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-plugin-plugin
 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-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-doxia-sitetools
 BuildRequires: plexus-container-default
@@ -32,9 +31,9 @@ BuildRequires: junit
 BuildRequires: maven-shared-reporting-impl
 BuildRequires: plexus-digest
 
-Requires: maven2
-Requires:       jpackage-utils
-Requires:       java
+Requires: plexus-containers
+Requires: jpackage-utils
+Requires: java
 Requires(post):       jpackage-utils
 Requires(postun):     jpackage-utils
 
@@ -52,25 +51,15 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}/plexus
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/plexus
-
-(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/plexus/%{name}.jar
 
 %add_to_maven_depmap org.sonatype.plexus %{name} %{version} JPP/plexus %{name}
 
@@ -80,10 +69,8 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/plexus/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
 
 %post
 %update_maven_depmap
@@ -91,9 +78,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/plexus/*
@@ -103,10 +87,14 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/plexus/%{name}-%{version}
 %{_javadocdir}/plexus/%{name}
 
 %changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako at redhat.com> 1.5-5
+- Do not require maven2.
+- Build with maven (v. 3) by default.
+- drop obsoleted parts of the spec.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -119,4 +107,4 @@ rm -rf %{buildroot}
 - Correct URL
 
 * Tue May 18 2010 Hui Wang <huwang at redhat.com> - 1.5-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package