From 046492a80dfe06f375b86aae0c803d90094e5045 Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Sep 17 2013 10:12:11 +0000
Subject: Update for latest guidelines, rhbz #993389


---

diff --git a/svgsalamander.spec b/svgsalamander.spec
index c1f2137..7bf7423 100644
--- a/svgsalamander.spec
+++ b/svgsalamander.spec
@@ -3,7 +3,7 @@
 
 Name:           svgsalamander
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An SVG engine for Java
 
 Group:          Development/Libraries
@@ -15,15 +15,10 @@ Source1:        %{name}-generate-tarball.sh
 
 BuildArch:      noarch
 BuildRequires:  jpackage-utils 
-BuildRequires:  junit
 BuildRequires:  maven-local
 BuildRequires:  java-devel
 BuildRequires:  javacc-maven-plugin
 BuildRequires:  maven-enforcer-plugin
-Requires:       java
-Requires:       jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun):jpackage-utils
 
 
 %description
@@ -36,8 +31,6 @@ menus to charts and graphcs to complex animations.
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -58,42 +51,27 @@ done
 
 %build
 pushd svg-core
-mvn-rpmbuild install javadoc:aggregate 
+%mvn_file : %{name} svgSalamander svg-salamander
+%mvn_alias : com.kitfox.svg:svg-salamander
+%mvn_build
 popd
 
 %install
-mkdir -p %{buildroot}%{_javadir}
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-
-install -Dpm 0644 svg-core/target/kitfox-svg-salamander-1.0.8.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/svgSalamander.jar
-
-install -Dpm 644 www/maven/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap com.kitfox.svg svg-salamander %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-
-%postun
-%update_maven_depmap
-
-%files
-%defattr(-,root,root,-)
-%doc  www/docs/{exampleCode/,use.html}
-%{_javadir}/%{name}.jar
-%{_javadir}/svgSalamander.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-
-%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}
+pushd svg-core
+%mvn_install
+popd
 
+%files -f svg-core/.mfiles
+%doc www/docs/{exampleCode/,use.html}
+%doc www/license/*
 
+%files javadoc -f svg-core/.mfiles-javadoc
+%doc www/license/*
 
 %changelog
+* Tue Sep 17 2013 Mat Booth <fedora@matbooth.co.uk> - 0.1.19-2
+- Update for latest guidelines, rhbz #993389
+
 * Tue Aug 06 2013 Cédric OLIVIER <cedric.olivier@free.fr> 0.1.19-1
 - Update to release 0.1.19