[port-allocator-maven-plugin] Use maven macros and java-headless

[Gerard Ryan]

commit 6bbeae4ee6817de1def0925d7bc992a34aba974d
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Mon Mar 3 21:40:21 2014 +0000

    Use maven macros and java-headless

 port-allocator-maven-plugin.spec |   37 +++++++++----------------------------
 1 files changed, 9 insertions(+), 28 deletions(-)
---
diff --git a/port-allocator-maven-plugin.spec b/port-allocator-maven-plugin.spec
index 278cc7c..8aba765 100644
--- a/port-allocator-maven-plugin.spec
+++ b/port-allocator-maven-plugin.spec
@@ -1,6 +1,6 @@
 Name:		port-allocator-maven-plugin
 Version:	1.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Port Allocator Maven Plugin
 
 Group:		Development/Libraries
@@ -17,8 +17,6 @@ Patch0:		%{name}-parent.patch
 
 BuildArch:	noarch
 
-BuildRequires:	java-devel
-BuildRequires:	jpackage-utils
 BuildRequires:	maven-local
 BuildRequires:	maven-compiler-plugin
 BuildRequires:	maven-enforcer-plugin
@@ -29,18 +27,11 @@ BuildRequires:	maven-jar-plugin
 BuildRequires:	maven-javadoc-plugin
 BuildRequires:	sonatype-oss-parent
 
-Requires:	java
-Requires:	jpackage-utils
-Requires:	maven
-Requires:	sonatype-oss-parent
-
 %description
 Allocate ports to be used during maven build process.
 
 %package javadoc
 Summary:	Javadocs for %{name}
-Group:		Documentation
-Requires:	jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -56,33 +47,23 @@ find -name '*.jar' -exec rm -f '{}' \;
 
 
 %build
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build
 
 %install
+%mvn_install
 
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# POMs
-install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 0644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
 %doc LICENSE-2.0.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE-2.0.txt
-%{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Feb 03 2014 Gerard Ryan <galileo at fedoraproject.org> - 1.2-7
+- Use modern maven macros
+- RHBZ-1068491: Switch to java-headless requires
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild