[emma] Switch to new guidelines

[Marek Goldmann]

commit d043652f7a00a3c92c924bc9bf80bc5bf297ee73
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Jul 2 09:19:43 2014 +0200

    Switch to new guidelines

 emma.spec |   40 +++++++++++++---------------------------
 1 files changed, 13 insertions(+), 27 deletions(-)
---
diff --git a/emma.spec b/emma.spec
index 2b0430c..158b06a 100644
--- a/emma.spec
+++ b/emma.spec
@@ -33,7 +33,7 @@
 Summary:        Code Coverage Tool
 Name:           emma
 Version:        %{shortver}.5312
-Release:        14%{?dist}
+Release:        15%{?dist}
 Epoch:          0
 License:        CPL
 URL:            http://emma.sourceforge.net/
@@ -64,7 +64,7 @@ BuildRequires:  java-devel >= 0:1.6
 BuildRequires:  jpackage-utils >= 0:1.7.5-1jpp.3
 # For the timestamp hack (see above)
 BuildRequires:  bc
-Requires:       jpackage-utils >= 0:1.7.5-1jpp.3
+BuildRequires:  javapackages-local
 
 
 BuildArch:      noarch
@@ -102,37 +102,23 @@ rm lib/internal/stamptool.jar
 ant -Dbuild.compiler=modern build javadoc
 
 %install
+%mvn_artifact %{SOURCE1} dist/%{name}.jar
+%mvn_artifact %{SOURCE2} dist/%{name}_ant.jar
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -m 644 dist/%{name}_ant.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}_ant.jar
-
-# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 %{SOURCE2} \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}_ant.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_maven_depmap JPP-%{name}_ant.pom %{name}_ant.jar
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr out/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
+# JAVADOCS
+%mvn_install -J out/javadocs/
+
+%files -f .mfiles
 %doc cpl-v10.html
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}*
-%{_mavendepmapfragdir}/%{name}
+%dir %{_javadir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc cpl-v10.html
-%doc %{_javadocdir}/%{name}*
 
 %changelog
+* Wed Jul 02 2014 Marek Goldmann <mgoldman at redhat.com> - 0:2.0.5312-15
+- Switch to new guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0.5312-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild