rpms/hamcrest
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Build against easymock3.

Browse Source
This commit is contained in:
Alexander Kurtakov 2013-07-24 19:28:47 +03:00
parent 1dc3672395
commit 0e3f23517a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hamcrest.spec
View File

@ -50,7 +50,7 @@
Name: hamcrest Name: hamcrest
Version: 1.3 Version: 1.3
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 0 Epoch: 0
Summary: Library of matchers for building test expressions Summary: Library of matchers for building test expressions
License: BSD License: BSD
@ -81,7 +81,7 @@ Patch3: %{name}-%{version}-javadoc.patch
Requires: java >= 1:1.6.0 Requires: java >= 1:1.6.0
Requires: qdox Requires: qdox
%if %with integration %if %with integration
Requires: easymock2 Requires: easymock3
#Requires: jmock #Requires: jmock
%endif %endif
@ -91,7 +91,7 @@ BuildRequires: ant >= 0:1.6.5
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: zip BuildRequires: zip
%if %with integration %if %with integration
BuildRequires: easymock2 BuildRequires: easymock3
%endif %endif
%if %with jarjar %if %with jarjar
BuildRequires: 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 # BUILD/hamcrest-1.1/lib/integration/easymock-2.2.jar.no
%if %with integration %if %with integration
# easymock2 is now compat package # 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 # BUILD/hamcrest-1.1/lib/integration/jmock-1.10RC1.jar.no
ln -sf $(build-classpath jmock) lib/integration/ ln -sf $(build-classpath jmock) lib/integration/
%endif %endif
@ -270,6 +270,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Wed Jul 24 2013 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-3
- Build against easymock3.
* Wed Jul 03 2013 Michal Srb <msrb@redhat.com> - 0:1.3-2 * Wed Jul 03 2013 Michal Srb <msrb@redhat.com> - 0:1.3-2
- Add easymock2 to classpath (Resolves: #979501) - Add easymock2 to classpath (Resolves: #979501)