[java-sig-commits] [maven-gpg-plugin] Update to new upstream release.

[Alexander Kurtakov]

commit d5408bfdf47adebbcbea0e5d7c410113e2175a0a
Author: Alexander Kurtakov <akurtako(a)redhat.com&gt;
Date:   Fri Mar 25 14:18:17 2011 +0200

    Update to new upstream release.
    
    Adapt to current guidelines.

 .gitignore            |    1 +
 maven-gpg-plugin.spec |   40 ++++++++++++----------------------------
 sources               |    2 +-
 3 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83839a6..92b3728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-gpg-plugin-1.1.tar.xz
+maven-gpg-plugin-1.2-source-release.zip
diff --git a/maven-gpg-plugin.spec b/maven-gpg-plugin.spec
index a50039a..16f7c6a 100644
--- a/maven-gpg-plugin.spec
+++ b/maven-gpg-plugin.spec
@@ -1,22 +1,19 @@
 Name:           maven-gpg-plugin
-Version:        1.1
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Maven GPG Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-gpg-plugin/
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-gpg-plugin-1.1
-# tar caf maven-gpg-plugin-1.1.tar.xz maven-gpg-plugin-1.1
-Source0:        %{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:       
http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
 BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-plugin-plugin
@@ -25,7 +22,7 @@ BuildRequires: maven-surefire-maven-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
-Requires: maven2
+Requires: maven
 Requires: jpackage-utils
 Requires: java
 Requires: gnupg2
@@ -48,29 +45,15 @@ Requires: jpackage-utils
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
-%setup -q #You may need to update this according to your Source0
+%setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-# tests are skipped because we need new maven to actually execute
-# them. Remove when maven-2.2.x is done.
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven.test.skip=true \
-        install javadoc:javadoc
+mvn-rpmbuild 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}
 
@@ -89,9 +72,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -104,6 +84,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Mar 25 2011 Alexander Kurtakov <akurtako(a)redhat.com&gt; 1.2-1
+- Update to new upstream release.
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index ae9382e..c19392f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7a3ae0db3131e26e325b9b0acf41c6e  maven-gpg-plugin-1.1.tar.xz
+fb3d2b7c31e11eeb0ac02c30acd41480  maven-gpg-plugin-1.2-source-release.zip