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

Add easymock2 to classpath (Resolves: #979501)

Browse Source 
Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
This commit is contained in:
Michal Srb 2013-07-03 13:06:01 +02:00 committed by Mikolaj Izdebski
parent 5275b44dee
commit 1dc3672395
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hamcrest.spec
View File

@ -50,7 +50,7 @@
Name: hamcrest Name: hamcrest
Version: 1.3 Version: 1.3
Release: 1%{?dist} Release: 2%{?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
@ -90,7 +90,9 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.6.5 BuildRequires: ant >= 0:1.6.5
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: zip BuildRequires: zip
%if %with integration
BuildRequires: easymock2 BuildRequires: easymock2
%endif
%if %with jarjar %if %with jarjar
BuildRequires: jarjar BuildRequires: jarjar
%endif %endif
@ -142,10 +144,9 @@ ln -sf $(build-classpath jarjar) lib/generator/
ln -sf $(build-classpath qdox) lib/generator/ 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
ln -sf $(build-classpath easymock2) lib/integration/ # easymock2 is now compat package
%endif ln -sf $(build-classpath easymock2-2.4) lib/integration/
# BUILD/hamcrest-1.1/lib/integration/jmock-1.10RC1.jar.no # BUILD/hamcrest-1.1/lib/integration/jmock-1.10RC1.jar.no
%if %with integration
ln -sf $(build-classpath jmock) lib/integration/ ln -sf $(build-classpath jmock) lib/integration/
%endif %endif
# BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no # BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no
@ -269,6 +270,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Wed Jul 03 2013 Michal Srb <msrb@redhat.com> - 0:1.3-2
- Add easymock2 to classpath (Resolves: #979501)
* Thu Mar 21 2013 Tomas Radej <tradej@redhat.com> - 0:1.3-1 * Thu Mar 21 2013 Tomas Radej <tradej@redhat.com> - 0:1.3-1
- Updated to latest upstream version - Updated to latest upstream version