[maven-deploy-plugin/f16] Update to 2.7 + Guideline fixes

[Tomas Radej]

commit 5876411be5e95d2073ea04eb871c72561bb94476
Author: Tomas Radej <tradej at redhat.com>
Date:   Mon Sep 19 15:22:46 2011 +0200

    Update to 2.7 + Guideline fixes

 .gitignore                                 |    1 +
 maven-deploy-plugin-maven-compat-dep.patch |   16 ++++++++++++++++
 maven-deploy-plugin.spec                   |   27 +++++++++++++--------------
 sources                                    |    2 +-
 4 files changed, 31 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 108bed6..8487096 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-deploy-plugin-2.5.tgz
 /maven-deploy-plugin-2.6-source-release.zip
+/maven-deploy-plugin-2.7-source-release.zip
diff --git a/maven-deploy-plugin-maven-compat-dep.patch b/maven-deploy-plugin-maven-compat-dep.patch
new file mode 100644
index 0000000..a69c636
--- /dev/null
+++ b/maven-deploy-plugin-maven-compat-dep.patch
@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index b570ee9..133751d 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -58,6 +58,11 @@ under the License.
+   <dependencies>
+     <dependency>
+       <groupId>org.apache.maven</groupId>
++      <artifactId>maven-compat</artifactId>
++      <version>${mavenVersion}</version>
++    </dependency>
++   <dependency>
++      <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-api</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
diff --git a/maven-deploy-plugin.spec b/maven-deploy-plugin.spec
index 4a4335d..48b65fa 100644
--- a/maven-deploy-plugin.spec
+++ b/maven-deploy-plugin.spec
@@ -1,5 +1,5 @@
 Name:           maven-deploy-plugin
-Version:        2.6
+Version:        2.7
 Release:        1%{?dist}
 Summary:        Maven Deploy Plugin
 
@@ -8,6 +8,9 @@ License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-deploy-plugin/
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
+# Dependency on maven-compat was missing in pom.xml resulting in missing classes
+Patch0:         %{name}-maven-compat-dep.patch
+
 BuildArch: noarch
 
 # Basic stuff
@@ -38,8 +41,6 @@ BuildRequires: maven-invoker-plugin
 Requires: java
 Requires: maven
 Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 Provides:       maven2-plugin-deploy = 0:%{version}-%{release}
 Obsoletes:      maven2-plugin-deploy <= 0:2.0.8
@@ -57,11 +58,11 @@ API documentation for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-mvn-rpmbuild \
-        -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+# A test class doesn't compile
+mvn-rpmbuild -Dmaven.test.skip install javadoc:aggregate
 
 %install
 # jars
@@ -79,23 +80,21 @@ install -pm 644 pom.xml \
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
+%doc DEPENDENCIES LICENSE NOTICE 
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
+%doc LICENSE
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Sep 20 2011 Tomas Radej <tradej at redhat.com> - 2.7-1
+- Update to upstream 2.7
+- Guidelines fixes
+
 * Tue May 17 2011 Alexander Kurtakov <akurtako at redhat.com> 2.6-1
 - Update to upstream 2.6.
 - Adapt to current guidelines.
diff --git a/sources b/sources
index 20d2c32..6f2cac3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caa04822c9e66ed0a27778d16914cdeb  maven-deploy-plugin-2.6-source-release.zip
+2f8aa762a6ded11453f9d6efb7823285  maven-deploy-plugin-2.7-source-release.zip