Use junit R/BR over junit4.

This commit is contained in:
Severin Gehwolf 2014-05-22 16:10:44 +02:00
parent 0d64967594
commit 74ae5b2fc9
2 changed files with 21 additions and 3 deletions

13
mockito-junit4.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/mockito-1.9.0/build.xml b/mockito-1.9.0/build.xml
index e6b49e8..487b632 100644
--- a/mockito-1.9.0/build.xml
+++ b/mockito-1.9.0/build.xml
@@ -44,7 +44,7 @@
<path id="compile.classpath">
<fileset dir="/usr/share/java">
<include name="hamcrest/core.jar" />
- <include name="junit4.jar" />
+ <include name="junit.jar" />
<include name="objenesis.jar" />
<include name="cglib.jar" />
</fileset>

View File

@ -1,6 +1,6 @@
Name: mockito Name: mockito
Version: 1.9.0 Version: 1.9.0
Release: 15%{?dist} Release: 16%{?dist}
Summary: A Java mocking framework Summary: A Java mocking framework
License: MIT License: MIT
@ -14,6 +14,7 @@ Patch3: fix-bnd-config.patch
Patch4: %{name}-matcher.patch Patch4: %{name}-matcher.patch
# Workaround for NPE in setting NamingPolicy in cglib # Workaround for NPE in setting NamingPolicy in cglib
Patch5: setting-naming-policy.patch Patch5: setting-naming-policy.patch
Patch6: mockito-junit4.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
@ -21,14 +22,14 @@ BuildRequires: java-devel
BuildRequires: ant BuildRequires: ant
BuildRequires: objenesis BuildRequires: objenesis
BuildRequires: cglib BuildRequires: cglib
BuildRequires: junit4 BuildRequires: junit
BuildRequires: hamcrest BuildRequires: hamcrest
BuildRequires: aqute-bnd BuildRequires: aqute-bnd
Requires: jpackage-utils Requires: jpackage-utils
Requires: objenesis Requires: objenesis
Requires: cglib Requires: cglib
Requires: junit4 Requires: junit
Requires: hamcrest Requires: hamcrest
%description %description
@ -55,6 +56,7 @@ sed -i 's/Bundle-Version= ${version}/Bundle-Version= %{version}/' conf/mockito-c
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p2
%build %build
build-jar-repository lib/compile objenesis build-jar-repository lib/compile objenesis
@ -91,6 +93,9 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc NOTICE %doc NOTICE
%changelog %changelog
* Thu May 22 2014 Severin Gehwolf <sgehwolf@redhat.com> - 1.9.0-16
- Use junit R/BR over junit4.
* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 1.9.0-15 * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 1.9.0-15
- Use Requires: java-headless rebuild (#1067528) - Use Requires: java-headless rebuild (#1067528)