[maven-deploy-plugin] fix rhbz#992184

[Alexander Kurtakov]

commit 30de1ec951c4e1263af293aacaa59d423bdb802d
Author: gil <puntogil at libero.it>
Date:   Mon Aug 12 16:08:48 2013 +0200

    fix rhbz#992184

 maven-deploy-plugin.spec |   58 ++++++++++++---------------------------------
 1 files changed, 16 insertions(+), 42 deletions(-)
---
diff --git a/maven-deploy-plugin.spec b/maven-deploy-plugin.spec
index d64f0b7..a986e69 100644
--- a/maven-deploy-plugin.spec
+++ b/maven-deploy-plugin.spec
@@ -1,9 +1,7 @@
 Name:           maven-deploy-plugin
 Version:        2.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Maven Deploy Plugin
-
-Group:          Development/Libraries
 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
@@ -11,19 +9,11 @@ Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%
 BuildArch: noarch
 
 # Basic stuff
-BuildRequires: jpackage-utils
 BuildRequires: java-devel >= 1:1.6.0
 
 # Maven and its dependencies
 BuildRequires: maven-local
 BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-plugin
 BuildRequires: maven-plugin-cobertura
 BuildRequires: maven-archiver
 BuildRequires: mvn(org.apache.maven:maven-artifact:2.0.6)
@@ -33,22 +23,17 @@ BuildRequires: maven-changes-plugin
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-invoker-plugin
 
-Requires: java
-Requires: maven
-Requires: jpackage-utils
-Requires: mvn(org.apache.maven:maven-artifact:2.0.6)
-Requires: mvn(org.apache.maven:maven-model:2.0.6)
+Requires:      mvn(org.apache.maven:maven-artifact:2.0.6)
+Requires:      mvn(org.apache.maven:maven-model:2.0.6)
 
-Provides:       maven2-plugin-deploy = 0:%{version}-%{release}
-Obsoletes:      maven2-plugin-deploy <= 0:2.0.8
+Provides:      maven2-plugin-deploy = 0:%{version}-%{release}
+Obsoletes:     maven2-plugin-deploy <= 0:2.0.8
 
 %description
 Uploads the project artifacts to the internal remote repository.
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -63,36 +48,25 @@ API documentation for %{name}.
         </configuration>"
 
 %build
+
+%mvn_file :%{name} %{name}
 # A test class doesn't compile
-mvn-rpmbuild -Dmaven.test.skip install javadoc:aggregate
+%mvn_build -f
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
-
-%add_to_maven_depmap org.apache.maven.plugins maven-deploy-plugin %{version} JPP maven-deploy-plugin
+%mvn_install
 
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
 %doc DEPENDENCIES LICENSE NOTICE 
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Mon Aug 12 2013 gil cattaneo <puntogil at libero.it> 2.7-10
+- fix rhbz#992184
+- update to current packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild