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