[maven-release] fix rhbz#984875, rhbz#992200

[Mikolaj Izdebski]

commit 4e70ad56829daa84dae1631395f31d6d9df25a82
Author: gil <puntogil at libero.it>
Date:   Mon Aug 12 18:31:53 2013 +0200

    fix rhbz#984875, rhbz#992200
    
    Signed-off-by: Mikolaj Izdebski <mizdebsk at redhat.com>

 maven-release.spec |   95 +++++++++++++++------------------------------------
 1 files changed, 28 insertions(+), 67 deletions(-)
---
diff --git a/maven-release.spec b/maven-release.spec
index 91f1ee9..bb3b333 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -1,9 +1,7 @@
 Name:           maven-release
 Version:        2.2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Release a project updating the POM and tagging in the SCM
-
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-release-plugin/
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/release/%{name}/%{version}/%{name}-%{version}-source-release.zip
@@ -14,17 +12,11 @@ Patch2:         003-fixing-migration-to-component-metadata.patch
 BuildArch:      noarch
 
 BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
 BuildRequires:  maven-local
-BuildRequires:  maven-scm 
+BuildRequires:  maven-scm
 BuildRequires:  maven-antrun-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-source-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-install-plugin
 BuildRequires:  maven-plugin-plugin
-BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven-plugin-testing-harness
 BuildRequires:  plexus-containers-component-metadata
@@ -33,49 +25,35 @@ BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-enforcer-plugin
 BuildRequires:  jaxen
 
-Requires:       java 
-Requires:       jpackage-utils
-
 %description
 This plugin is used to release a project with Maven, saving a lot of 
 repetitive, manual work. Releasing a project is made in two steps: 
 prepare and perform.
 
-
 %package manager
 Summary:        Release a project updating the POM and tagging in the SCM
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description manager
 This package contains %{name}-manager needed by %{name}-plugin.
 
-
 %package plugin
 Summary:        Release a project updating the POM and tagging in the SCM
-Group:          Development/Libraries
-Requires:       %{name}-manager = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description plugin
 This plugin is used to release a project with Maven, saving a lot of
 repetitive, manual work. Releasing a project is made in two steps:
 prepare and perform.
 
-
 %package javadoc
-Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
+Summary:        Javadoc for %{name}
+Provides:       %{name}-manager-javadoc = %{version}-%{release}
 Obsoletes:      %{name}-manager-javadoc <= 2.0-1
+Provides:       %{name}-plugin-javadoc = %{version}-%{release}
 Obsoletes:      %{name}-plugin-javadoc <= 2.0-1
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -92,52 +70,35 @@ EOT
 
 
 %build
-# Skip tests because we don't have dependencies (jmock)
-mvn-rpmbuild -e -Dmaven.test.skip=true install javadoc:aggregate
 
+%mvn_file :%{name}-manager %{name}-manager
+%mvn_file :%{name}-plugin %{name}-plugin
+%mvn_package :%{name}-manager manager
+%mvn_package :%{name}-plugin plugin
+# Skip tests because we don't have dependencies (jmock)
+%mvn_build -f
 
 %install
-# jars
-install -Dp -m 644 %{name}-manager/target/%{name}-manager-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-manager.jar
-install -Dp -m 644 %{name}-plugin/target/%{name}-plugin-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-plugin.jar
-
-# javadocs
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/
-cp -rp target/site/apidocs  $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# poms
-install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
-install -pm 644 pom.xml  \
-  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 %{name}-manager/pom.xml  \
-  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-manager.pom
-install -pm 644 %{name}-plugin/pom.xml  \
-  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-plugin.pom
-
-%add_maven_depmap JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}-manager.pom %{name}-manager.jar
-%add_maven_depmap JPP-%{name}-plugin.pom %{name}-plugin.jar
-
-%files
-%doc README
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/*
-
-%files manager
-%{_javadir}/*manager*
-%{_mavenpomdir}/JPP-%{name}-manager.pom
-
-%files plugin
-%{_javadir}/*plugin*
-%{_mavenpomdir}/JPP-%{name}-plugin.pom
-
-%files javadoc
-%{_javadocdir}/%{name}
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE NOTICE README
 
+%files manager -f .mfiles-manager
+%doc LICENSE NOTICE
+
+%files plugin -f .mfiles-plugin
+%doc LICENSE NOTICE
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Mon Aug 12 2013 gil cattaneo <puntogil at libero.it> 2.2.1-9
+- fix rhbz#984875, rhbz#992200
+- fix some rpmlint problems
+- update to current packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild