[xmltool/f20] Update for newer guidelines, rhbz #993147

[mbooth]

commit 35c3e5a81a5b4b75e9b5fec1d49ce18cfb716291
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Thu Aug 29 22:36:30 2013 +0100

    Update for newer guidelines, rhbz #993147

 xmltool.spec |   36 +++++++++---------------------------
 1 files changed, 9 insertions(+), 27 deletions(-)
---
diff --git a/xmltool.spec b/xmltool.spec
index 5143065..c7ba680 100644
--- a/xmltool.spec
+++ b/xmltool.spec
@@ -1,6 +1,6 @@
 Name:           xmltool
 Version:        3.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Tool to manage XML documents through a Fluent Interface
 
 Group:          Development/Libraries
@@ -20,9 +20,6 @@ BuildRequires:  maven-remote-resources-plugin
 BuildRequires:  maven-surefire-provider-testng
 BuildRequires:  apache-resource-bundles
 
-Requires:       java 
-Requires:       jpackage-utils
-
 %description
 XMLTool is a very simple Java library to be able to do all sorts of common 
 operations with an XML document. Java developers often end up writing the same 
@@ -32,7 +29,6 @@ together, using the Fluent Interface pattern to facilitate XML manipulations.
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -43,6 +39,7 @@ This package contains the API documentation for %{name}.
 # Fix end-of-line encoding
 sed -i 's/\r//' LICENSE.txt
 
+%mvn_file : %{name}
 
 %build
 # Remove dep on maven-wagon and maven-license plugins
@@ -50,36 +47,21 @@ sed -i 's/\r//' LICENSE.txt
 %pom_remove_plugin com.google.code.maven-license-plugin:maven-license-plugin
 
 # Disable tests because they require an internet connection to run!
-mvn-rpmbuild \
-  -Dmaven.test.skip=true \
-  install javadoc:javadoc
-
+%mvn_build -f
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-install -Dp -m 644 target/%{name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/  $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 29 2013 Mat Booth <fedora at matbooth.co.uk> - 3.3-10
+- Update for newer guidelines, rhbz #993147
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild