Hello community, here is the log from the commit of package hamcrest for openSUSE:Factory checked in at 2019-02-04 21:18:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hamcrest (Old) and /work/SRC/openSUSE:Factory/.hamcrest.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hamcrest" Mon Feb 4 21:18:00 2019 rev:24 rq:666149 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes 2019-01-15 09:10:15.806575064 +0100 +++ /work/SRC/openSUSE:Factory/.hamcrest.new.28833/hamcrest.changes 2019-02-04 21:18:01.679722613 +0100 @@ -1,0 +2,5 @@ +Tue Jan 15 08:52:39 UTC 2019 - Fridrich Strba <[email protected]> + +- Make jmock and easymock integration opt-in (bsc#1121956) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hamcrest.spec ++++++ --- /var/tmp/diff_new_pack.FdPpaQ/_old 2019-02-04 21:18:02.395722343 +0100 +++ /var/tmp/diff_new_pack.FdPpaQ/_new 2019-02-04 21:18:02.399722341 +0100 @@ -16,6 +16,8 @@ # +%bcond_with jmock +%bcond_with easymock Name: hamcrest Version: 1.3 Release: 0 @@ -39,12 +41,18 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local -BuildRequires: jmock BuildRequires: qdox >= 2.0 Requires: %{name}-core = %{version}-%{release} -Requires: jmock Requires: qdox >= 2.0 BuildArch: noarch +%if %{with jmock} +BuildRequires: jmock +Requires: jmock +%endif +%if %{with easymock} +BuildRequires: easymock +Requires: easymock +%endif %description Provides a library of matcher objects (also known as constraints or @@ -80,11 +88,20 @@ %setup -q -n JavaHamcrest-%{name}-java-%{version} find . -type f -name "*.jar" | xargs -t rm -rm -fr hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java -rm -fr hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java -# BUILD/hamcrest-1.1/lib/generator/qdox-1.6.1.jar.no ln -sf $(build-classpath qdox) lib/generator/ +%if %{with jmock} ln -sf $(build-classpath jmock) lib/integration/ +%else +rm -fr hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java +rm -fr hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java +rm -fr hamcrest-unit-test/src/main/java/org/hamcrest/integration/JMock1AdapterTest.java +%endif +%if %{with easymock} +ln -sf $(build-classpath easymock3) lib/integration/ +%else +rm -fr hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java +rm -fr hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java +%endif %patch0 -p1 %patch1 -p1
