[jmock] Use .mfiles generated during build
gil
gil at fedoraproject.org
Thu May 22 14:11:15 UTC 2014
commit 6cc46b098ebe38a714b91be77e30ac7b941b522f
Author: gil <puntogil at libero.it>
Date: Thu May 22 16:11:01 2014 +0200
Use .mfiles generated during build
jmock.spec | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/jmock.spec b/jmock.spec
index 4ae5c4d..2a0e8ba 100644
--- a/jmock.spec
+++ b/jmock.spec
@@ -3,7 +3,7 @@
Name: jmock
Version: 2.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java library for testing code with mock objects
License: BSD
Url: http://www.jmock.org/
@@ -41,13 +41,13 @@ BuildRequires: ant-junit
BuildRequires: bsh
BuildRequires: cglib
BuildRequires: hamcrest12
-BuildRequires: junit4
+BuildRequires: junit
BuildRequires: objectweb-asm3
BuildRequires: objenesis
Requires: bsh
Requires: hamcrest12
-Requires: junit4
+Requires: junit
Requires: objenesis
Requires: jpackage-utils
@@ -78,6 +78,7 @@ sed -i "s|objectweb-asm/asm.jar|objectweb-asm3/asm.jar|" build.xml
sed -i "s|objenesis|objenesis/objenesis|" build.xml
sed -i "s|hamcrest12/core.jar|hamcrest12/hamcrest-core-1.2.jar|" build.xml
sed -i "s|hamcrest12/library.jar|hamcrest12/hamcrest-library-1.2.jar|" build.xml
+sed -i "s|junit4.jar|junit.jar|" build.xml
%patch1 -p1
%patch2 -p0
%patch3 -p0
@@ -132,11 +133,8 @@ install -pm 644 maven/%{name}-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{nam
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr build/%{name}-%{namedversion}/doc/* %{buildroot}%{_javadocdir}/%{name}
-%files
+%files -f .mfiles
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/*.jar
-%{_mavenpomdir}/JPP.%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
%doc LICENSE.txt README*
%files javadoc
@@ -144,6 +142,10 @@ cp -pr build/%{name}-%{namedversion}/doc/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Thu May 22 2014 gil cattaneo <puntogil at libero.it> 2.5.1-6
+- Use .mfiles generated during build
+- Fix junit dep
+
* Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 2.5.1-5
- Use Requires: java-headless rebuild (#1067528)
More information about the scm-commits
mailing list