pool/hamcrest
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 666149 from Java:packages

Browse Source 
Try to eliminate build cycle

OBS-URL: https://build.opensuse.org/request/show/666149
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hamcrest?expand=0&rev=24
This commit is contained in:
Stephan Kulow
2019-02-04 20:18:00 +00:00
committed by Git OBS Bridge
parent 6c8cce3a69 f2df007708
commit ad1bd9f7fa
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hamcrest.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 15 08:52:39 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Make jmock and easymock integration opt-in (bsc#1121956)
-------------------------------------------------------------------
Fri Jan 4 16:13:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>

27
hamcrest.spec
View File

@@ -16,6 +16,8 @@
#
%bcond_with jmock
%bcond_with easymock
Name: hamcrest
Version: 1.3
Release: 0
@@ -39,12 +41,18 @@ Patch8: %{name}-%{version}-random-build-crash.patch
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 @@ Demo files for %{name}.
%setup -q -n JavaHamcrest-%{name}-java-%{version}
find . -type f -name "*.jar" | xargs -t rm
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
# BUILD/hamcrest-1.1/lib/generator/qdox-1.6.1.jar.no
ln -sf $(build-classpath qdox) lib/generator/
ln -sf $(build-classpath jmock) lib/integration/
%endif
%patch0 -p1
%patch1 -p1