[jutils/f20] Update for latest guidelines rhbz #992650

[mbooth]

commit 4494698b54ba4925f050338f3054b2f9bb0ec06c
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Wed Sep 4 16:20:27 2013 +0100

    Update for latest guidelines rhbz #992650

 jutils.spec |   37 ++++++++++---------------------------
 1 files changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/jutils.spec b/jutils.spec
index 6658057..f43b7f5 100644
--- a/jutils.spec
+++ b/jutils.spec
@@ -1,6 +1,6 @@
 Name:           jutils
 Version:        1.0.1
-Release:        8.20110719svn%{?dist}
+Release:        9.20110719svn%{?dist}
 Summary:        Common utilities for the Java Gaming Interface
 
 Group:          Development/Libraries
@@ -17,9 +17,6 @@ BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  maven-local
 
-Requires:       java 
-Requires:       jpackage-utils
-
 %description
 This is the utils project that contains useful shared functionality
 for the other Java Games Initiative APIs.
@@ -28,7 +25,6 @@ for the other Java Games Initiative APIs.
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -38,37 +34,24 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}
 sed -i 's/-SNAPSHOT//' pom.xml
 
+%mvn_file : %{name}
+
 %build
 # Skip tests because they require an X display
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -- -Dmaven.test.skip=true
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-
-# jar
-install -Dp -m 644 target/%{name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-cp -a target/site/apidocs  $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
 
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
 %doc README.txt 
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Sep 04 2013 Mat Booth <fedora at matbooth.co.uk> - 1.0.1-9.20110719svn
+- Update for latest guidelines rhbz #992650
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-8.20110719svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild