Hello community, here is the log from the commit of package hamcrest for openSUSE:Factory checked in at 2013-10-30 15:37:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hamcrest (Old) and /work/SRC/openSUSE:Factory/.hamcrest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hamcrest" Changes: -------- --- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes 2013-10-22 14:52:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2013-10-30 15:37:09.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 29 12:51:11 UTC 2013 - [email protected] + +- drop junit from dependencies, it's not needed and cause a build cycle + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hamcrest.spec ++++++ --- /var/tmp/diff_new_pack.3tAUhT/_old 2013-10-30 15:37:12.000000000 +0100 +++ /var/tmp/diff_new_pack.3tAUhT/_new 2013-10-30 15:37:12.000000000 +0100 @@ -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 @@ %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: 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 @@ # 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 @@ %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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
