diff --git a/hamcrest.spec b/hamcrest.spec index 02f6c50..55601fb 100644 --- a/hamcrest.spec +++ b/hamcrest.spec @@ -50,7 +50,7 @@ Name: hamcrest Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Library of matchers for building test expressions License: BSD @@ -90,7 +90,9 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant >= 0:1.6.5 BuildRequires: ant-junit BuildRequires: zip +%if %with integration BuildRequires: easymock2 +%endif %if %with jarjar BuildRequires: jarjar %endif @@ -142,10 +144,9 @@ ln -sf $(build-classpath jarjar) lib/generator/ ln -sf $(build-classpath qdox) lib/generator/ # BUILD/hamcrest-1.1/lib/integration/easymock-2.2.jar.no %if %with integration -ln -sf $(build-classpath easymock2) lib/integration/ -%endif +# easymock2 is now compat package +ln -sf $(build-classpath easymock2-2.4) lib/integration/ # BUILD/hamcrest-1.1/lib/integration/jmock-1.10RC1.jar.no -%if %with integration ln -sf $(build-classpath jmock) lib/integration/ %endif # 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} %changelog +* Wed Jul 03 2013 Michal Srb - 0:1.3-2 +- Add easymock2 to classpath (Resolves: #979501) + * Thu Mar 21 2013 Tomas Radej - 0:1.3-1 - Updated to latest upstream version