pool/hamcrest
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- drop junit from dependencies, it's not needed and cause a build cycle

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=11
This commit is contained in:
Michal Vyskocil 2013-10-29 12:51:43 +00:00 committed by Git OBS Bridge
parent eee6d90e82
commit fec38b9fd1
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hamcrest.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 29 12:51:11 UTC 2013 - mvyskocil@suse.com
- drop junit from dependencies, it's not needed and cause a build cycle
-------------------------------------------------------------------
Mon Oct 21 11:34:31 UTC 2013 - mvyskocil@suse.com

16
hamcrest.spec
View File

@ -20,7 +20,7 @@
%define _without_tests 1
%define _withouth_jarjar 1
# This option controls integration which requires easymock2 and jmock
# This option controls integration which requires easymock2 and jmock and junit
%bcond_without integration
# This option controls jarjar on qdox
@ -76,7 +76,6 @@ Requires: jmock
%endif
BuildRequires: ant >= 1.6.5
#BuildRequires: ant-junit
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools
BuildRequires: zip
@ -87,15 +86,10 @@ BuildRequires: easymock2
BuildRequires: jarjar
%endif
%if %with integration
BuildRequires: ant-junit
BuildRequires: jmock
%endif
BuildRequires: junit
#FIXME: build with junit4 once we will update junit4 to 4.11
# and remove bundled hamcrest parts, prevents us to build
# hamcrest itself
#BuildRequires: junit4
#junit4 does require hamcrest, but we don't need it for building itself
#!BuildIgnore: hamcrest
%endif
BuildRequires: qdox
%if %with tests
BuildRequires: testng
@ -149,11 +143,11 @@ ln -sf $(build-classpath easymock2) lib/integration/
# BUILD/%{name}-%{version}/lib/integration/jmock-%{version}0RC1.jar.no
%if %with integration
ln -sf $(build-classpath jmock) lib/integration/
%endif
# BUILD/%{name}-%{version}/lib/integration/junit-3.8.1.jar.no
ln -sf $(build-classpath junit) lib/integration/
# BUILD/%{name}-%{version}/lib/integration/junit-4.0.jar.no
#ln -sf $(build-classpath junit4) lib/integration/
%endif
# BUILD/%{name}-%{version}/lib/integration/testng-4.6-jdk15.jar.no
%if %with tests
ln -sf $(build-classpath testng-jdk15) lib/integration/
@ -172,7 +166,9 @@ perl -pi -e 's/\r$//g' LICENSE.txt
%build
export CLASSPATH=$(build-classpath qdox)
%if %with integration
export OPT_JAR_LIST="junit ant/ant-junit"
%endif
# The unit-test goal is switched off as some tests fail with JDK 7
# see https://github.com/hamcrest/JavaHamcrest/issues/30
ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc