[junit-addons] Use .mfiles generated during build

[gil]

commit d5013eaa3320c64813d2d72f67a53fd13678cf14
Author: gil <puntogil at libero.it>
Date:   Thu May 22 16:06:25 2014 +0200

    Use .mfiles generated during build

 junit-addons.spec |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/junit-addons.spec b/junit-addons.spec
index 8c0fd8d..00ed557 100644
--- a/junit-addons.spec
+++ b/junit-addons.spec
@@ -1,9 +1,8 @@
 
 Name:          junit-addons
 Version:       1.4
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       JUnitX helper classes for JUnit
-Group:         Development/Libraries
 License:       ASL 1.1
 Url:           http://sourceforge.net/projects/%{name}/
 Source0:       http://sourceforge.net/projects/%{name}/files/JUnit-addons/JUnit-addons%20%{version}/%{name}-%{version}.zip
@@ -17,14 +16,14 @@ BuildRequires: ant
 BuildRequires: apache-commons-logging
 BuildRequires: jaxen
 BuildRequires: jdom
-BuildRequires: junit4
+BuildRequires: junit
 BuildRequires: xerces-j2
 BuildRequires: xml-commons-apis
 
 Requires:      ant
 Requires:      jaxen
 Requires:      jdom
-Requires:      junit4
+Requires:      junit
 Requires:      xerces-j2
 
 Requires:      jpackage-utils
@@ -34,9 +33,7 @@ BuildArch:     noarch
 JUnit-addons is a collection of helper classes for JUnit. 
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
@@ -89,7 +86,7 @@ export OPT_JAR_LIST=:
   -Djaxen.jar=$(build-classpath jaxen) \
   -Dsaxpath.jar=$(build-classpath jaxen) \
   -Dant.jar=$(build-classpath ant.jar) \
-  -Djunit.jar=$(build-classpath junit4) \
+  -Djunit.jar=$(build-classpath junit) \
   -Dxerces.jar=$(build-classpath xerces-j2) \
   -Dxml-apis.jar=$(build-classpath xml-commons-apis) \
   -Dcommons-logging.jar=$(build-classpath commons-logging) \
@@ -109,10 +106,7 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/api/* %{buildroot}%{_javadocdir}/%{name}
 
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE README WHATSNEW
 
 %files javadoc
@@ -120,6 +114,10 @@ cp -pr build/api/* %{buildroot}%{_javadocdir}/%{name}
 %doc LICENSE
 
 %changelog
+* Thu May 22 2014 gil cattaneo <puntogil at libero.it> 1.4-7
+- Use .mfiles generated during build
+- Fix junit dep
+
 * Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 1.4-6
 - Use Requires: java-headless rebuild (#1067528)