[hamcrest] Build against easymock3.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jul 24 16:28:58 UTC 2013
commit 0e3f23517acd733692f1261b7be84070a2fb33fc
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Jul 24 19:28:47 2013 +0300
Build against easymock3.
hamcrest.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/hamcrest.spec b/hamcrest.spec
index 55601fb..e3eeedb 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -50,7 +50,7 @@
Name: hamcrest
Version: 1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -81,7 +81,7 @@ Patch3: %{name}-%{version}-javadoc.patch
Requires: java >= 1:1.6.0
Requires: qdox
%if %with integration
-Requires: easymock2
+Requires: easymock3
#Requires: jmock
%endif
@@ -91,7 +91,7 @@ BuildRequires: ant >= 0:1.6.5
BuildRequires: ant-junit
BuildRequires: zip
%if %with integration
-BuildRequires: easymock2
+BuildRequires: easymock3
%endif
%if %with jarjar
BuildRequires: jarjar
@@ -145,7 +145,7 @@ ln -sf $(build-classpath qdox) lib/generator/
# BUILD/hamcrest-1.1/lib/integration/easymock-2.2.jar.no
%if %with integration
# easymock2 is now compat package
-ln -sf $(build-classpath easymock2-2.4) lib/integration/
+ln -sf $(build-classpath easymock3) lib/integration/
# BUILD/hamcrest-1.1/lib/integration/jmock-1.10RC1.jar.no
ln -sf $(build-classpath jmock) lib/integration/
%endif
@@ -270,6 +270,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Wed Jul 24 2013 Alexander Kurtakov <akurtako at redhat.com> 0:1.3-3
+- Build against easymock3.
+
* Wed Jul 03 2013 Michal Srb <msrb at redhat.com> - 0:1.3-2
- Add easymock2 to classpath (Resolves: #979501)
More information about the scm-commits
mailing list