Update to current packaging guidelines

plexus-utils.spec

@@ -1,33 +1,3 @@
-# Copyright (c) 2000-2007, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
 %global parent plexus
 %global subname utils
 
@@ -44,26 +14,13 @@ Summary:        Plexus Common Utilities
 # Public domain: src/main/java/org/codehaus/plexus/util/TypeFormat.java
 # rest is ASL 2.0
 License:        ASL 1.1 and ASL 2.0 and xpp and BSD and Public Domain
-Group:          Development/Libraries
 URL:            http://plexus.codehaus.org/
 Source0:        https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
 Source1:        http://apache.org/licenses/LICENSE-2.0.txt
-
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.6
-Requires:       jpackage-utils
 
 BuildRequires:  maven-local
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-doxia-sitetools
-BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
-Requires:       java-headless >= 1:1.7.0
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -75,8 +32,6 @@ is like a J2EE application server, without all the baggage.
 
 %package javadoc
 Summary:          Javadoc for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -85,6 +40,9 @@ Javadoc for %{name}.
 %setup -q -n %{name}-%{name}-%{version}
 cp %{SOURCE1} .
 
+%mvn_file : plexus/utils
+%mvn_alias : plexus:plexus-utils
+
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
 %pom_xpath_inject "pom:build/pom:plugins" "
@@ -101,34 +59,21 @@ cp %{SOURCE1} .
         </plugin>"
 
 %build
-mvn-rpmbuild install javadoc:javadoc -Dmaven.test.failure.ignore=true
+%mvn_build -f
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{parent}
-install -pm 644 target/%{name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/utils.jar
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
-
-%add_maven_depmap -a "plexus:plexus-utils" JPP.%{name}.pom plexus/utils.jar
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
 
 %files -f .mfiles
 %doc NOTICE.txt LICENSE-2.0.txt
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc NOTICE.txt LICENSE-2.0.txt
-%doc %{_javadocdir}/%{name}
 
 %changelog
 * Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.18-1
 - Update to upstream version 3.0.18
+- Update to current packaging guidelines
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild