[java-sig-commits] [maven-ear-plugin: 1/2] Update to upstream 2.5 version.

[Alexander Kurtakov]

commit 05193b1af9bd72745282e7d3f2664bb1accf6f0c
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed May 18 11:26:25 2011 +0300

     Update to upstream 2.5 version.
    
    Adapt to current guidelines.

 .gitignore            |    1 +
 maven-ear-plugin.spec |   44 +++++++++++++++-----------------------------
 sources               |    2 +-
 3 files changed, 17 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be35cb7..7264cb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-ear-plugin-2.4.2.tar.bz2
+/maven-ear-plugin-2.5-source-release.zip
diff --git a/maven-ear-plugin.spec b/maven-ear-plugin.spec
index e152607..e0f597f 100644
--- a/maven-ear-plugin.spec
+++ b/maven-ear-plugin.spec
@@ -1,28 +1,25 @@
 Name:           maven-ear-plugin
-Version:        2.4.2
-Release:        2%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        Maven EAR Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-ear-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.4.2/
-#tar jcf maven-ear-plugin-2.4.2.tar.bz2 maven-ear-plugin-2.4.2/
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
-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-archiver
 BuildRequires: plexus-archiver
 BuildRequires: plexus-container-default
@@ -32,7 +29,7 @@ BuildRequires: maven-shared-verifier
 BuildRequires: xmlunit
 BuildRequires: junit
 
-Requires:       maven2
+Requires:       maven
 Requires:       java
 Requires:       jpackage-utils
 Requires:       plexus-archiver
@@ -61,22 +58,13 @@ 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 \
+mvn-rpmbuild \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
-install -Dpm 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 -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
 
@@ -84,10 +72,8 @@ install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}
 install -Dpm 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
@@ -95,9 +81,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -106,12 +89,15 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 18 2011 Alexander Kurtakov <akurtako at redhat.com> 2.5-1
+- Update to upstream 2.5 version.
+- Adapt to current guidelines.
+
 * Mon Jun 07 2010 Hui Wang <huwang at redhat.com> - 2.4.2-2
 - Added missing requires
 
 * Mon May 31 2010 Hui Wang <huwang at redhat.com> - 2.4.2-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package
diff --git a/sources b/sources
index ed46622..3f28232 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aab615965484bbe782df0725aa2bc43f  maven-ear-plugin-2.4.2.tar.bz2
+9de26bb3b02278d5fac17889ec343df9  maven-ear-plugin-2.5-source-release.zip