[spin/f20] Update for newer guidelines, rhbz #993375

[mbooth]

commit 85f27fc5700ba169c2cd68eadd9b196551b2df00
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Sat Aug 31 14:44:20 2013 +0100

    Update for newer guidelines, rhbz #993375

 spin.spec |   36 +++++++++++-------------------------
 1 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/spin.spec b/spin.spec
index 4958f5e..a67509a 100644
--- a/spin.spec
+++ b/spin.spec
@@ -1,6 +1,6 @@
 Name:           spin
 Version:        1.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A transparent threading solution for non-freezing Swing applications
 License:        LGPLv2
 Group:          Development/Tools
@@ -17,14 +17,6 @@ BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  cglib
 BuildRequires:  objectweb-asm
 
-
-Requires:       java >= 1:1.6.0
-Requires:       jpackage-utils
-
-Requires:       cglib
-Requires:       objectweb-asm
-
-
 %description
 Spin is a small library that concentrates on offering a powerful solution
 to build non-freezing Swing applications. Spin enforces good application
@@ -35,7 +27,7 @@ never have to think about threads again.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
+
 %description javadoc
 Documentation for the spin Java library.
 
@@ -46,31 +38,25 @@ Documentation for the spin Java library.
 # Compile against the correct version of cglib
 %patch0 -p1
 
+%mvn_file : %{name}
+
 %build
 # One of the tests tries to access the X display
-mvn-rpmbuild install javadoc:aggregate -DskipTests
+%mvn_build -f
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar
-install -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/
-cp -r target/site/apidocs ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
 
-
-%files
+%files -f .mfiles
 %doc license.txt
-%{_javadir}/*.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc license.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Sat Aug 31 2013 Mat Booth <fedora at matbooth.co.uk> - 1.5-11
+- Update for newer guidelines, rhbz #993375
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild