[maven-clean-plugin] Build with maven 3.x.

[Alexander Kurtakov]

commit 72f6662d67fb6980c279ad015fa521b5a2c5e469
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Jun 8 11:20:00 2011 +0300

    Build with maven 3.x.
    
    Use upstream sources.
    Guidelines fixes.

 .gitignore              |    1 +
 maven-clean-plugin.spec |   57 +++++++++++++++++-----------------------------
 sources                 |    2 +-
 3 files changed, 23 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c94900..21dad7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-clean-plugin-2.4.1.tar.xz
+/maven-clean-plugin-2.4.1-source-release.zip
diff --git a/maven-clean-plugin.spec b/maven-clean-plugin.spec
index a984787..a49976b 100644
--- a/maven-clean-plugin.spec
+++ b/maven-clean-plugin.spec
@@ -1,31 +1,28 @@
 Name:           maven-clean-plugin
 Version:        2.4.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven Clean Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-clean-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.4.1 maven-clean-plugin-2.4.1
-#tar caf maven-clean-plugin-2.4.1.tar.xz maven-clean-plugin-2.4.1/
-Source0:        %{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-resources-plugin
 BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-shared-plugin-testing-harness
-Requires: maven2
+BuildRequires: maven-plugin-testing-harness
+Requires: maven
 Requires:       jpackage-utils
 Requires:       java
 Requires(post):       jpackage-utils
@@ -52,23 +49,14 @@ API documentation for %{name}.
 %setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven.test.skip=true \
+mvn-rpmbuild \
+        -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins maven-clean-plugin %{version} JPP maven-clean-plugin
 
@@ -78,10 +66,8 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # 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}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -89,21 +75,20 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jun 8 2011 Alexander Kurtakov <akurtako at redhat.com> 2.4.1-4
+- Build with maven 3.x.
+- Use upstream sources.
+- Guidelines fixes.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 2a7d0a2..f1d47a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8456500ce232068bef66b10b5ffb1ded  maven-clean-plugin-2.4.1.tar.xz
+8287f1677b8113fd923ea7c1d3f46ad3  maven-clean-plugin-2.4.1-source-release.zip