[htmlunit-core-js] Use .mfiles generated during build, fix junit dep

gil gil at fedoraproject.org
Sun Jun 8 16:08:08 UTC 2014


commit 55dd85cb43530e65dfb117ba5a3c3ff9a3c68778
Author: gil <puntogil at libero.it>
Date:   Sun Jun 8 18:07:54 2014 +0200

    Use .mfiles generated during build, fix junit dep

 htmlunit-core-js.spec |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/htmlunit-core-js.spec b/htmlunit-core-js.spec
index 681c843..cf49917 100644
--- a/htmlunit-core-js.spec
+++ b/htmlunit-core-js.spec
@@ -2,8 +2,6 @@ Name:           htmlunit-core-js
 Version:        2.9
 Release:        7%{?dist}
 Summary:        Rhino fork for htmlunit
-
-Group:          Development/Libraries
 License:        MPLv1.1
 URL:            http://htmlunit.sourceforge.net/
 # svn export http://htmlunit.svn.sourceforge.net/svnroot/htmlunit/tags/core-js-2.9 htmlunit-core-js-2.9
@@ -15,7 +13,7 @@ BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
-BuildRequires:  junit4
+BuildRequires:  junit
 BuildRequires:  ant
 
 Requires:       jpackage-utils
@@ -25,10 +23,7 @@ This is a fork of Rhino to support HtmlUnit.
 Everyone hopes it will go away someday.
 
 %package javadoc
-Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
-Requires:       %{name} = %{version}-%{release}
+Summary:        Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -36,6 +31,8 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p0
+sed -i "|junit4|junit|" build.xml
+
 find . -regex '.*\.\(class\|jar\|zip\)' -exec rm -f '{}' \;
 
 %build
@@ -51,18 +48,14 @@ cp -rp target/javadoc/* $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
+%add_maven_depmap
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
+%files -f .mfiles
 %doc LICENSE.txt README.txt release.txt
 
 %files javadoc
 %{_javadocdir}/%{name}
+%doc LICENSE.txt
 
 %changelog
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-7


More information about the scm-commits mailing list