Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package junit for openSUSE:Factory checked in at 2023-03-25 18:54:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/junit (Old) and /work/SRC/openSUSE:Factory/.junit.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "junit" Sat Mar 25 18:54:52 2023 rev:29 rq:1074021 version:4.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/junit/junit.changes 2022-06-17 21:22:46.994782168 +0200 +++ /work/SRC/openSUSE:Factory/.junit.new.31432/junit.changes 2023-03-25 18:55:00.830556497 +0100 @@ -1,0 +2,6 @@ +Thu Mar 23 17:18:10 UTC 2023 - Fridrich Strba <[email protected]> + +- Conditionalize the spec file so that junit can be built with + both hamcrest 1.3 and 2.2 from the same sources + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ junit.spec ++++++ --- /var/tmp/diff_new_pack.FX1m8j/_old 2023-03-25 18:55:01.222558547 +0100 +++ /var/tmp/diff_new_pack.FX1m8j/_new 2023-03-25 18:55:01.226558567 +0100 @@ -1,7 +1,7 @@ # # spec file for package junit # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Patch0: 0001-Port-to-hamcrest-2.2.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: hamcrest >= 2.2 +BuildRequires: hamcrest >= 1.3 BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local Requires: mvn(org.hamcrest:hamcrest-core) @@ -64,15 +64,21 @@ %prep %setup -q -n %{name}4-r%{version} +%if %{?pkg_vcmp:%pkg_vcmp hamcrest >= 2.0}%{!?pkg_vcmp:0} %patch0 -p1 +%endif cp %{SOURCE1} . find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf +%if %{?pkg_vcmp:%pkg_vcmp hamcrest >= 2.0}%{!?pkg_vcmp:0} ln -s $(build-classpath hamcrest/hamcrest) lib/hamcrest-core-1.3.jar +%else +ln -s $(build-classpath hamcrest/all) lib/hamcrest-core-1.3.jar +%endif %build -export CLASSPATH=$(build-classpath hamcrest/hamcrest) +export CLASSPATH=$(build-classpath hamcrest) ant jars javadoc -Dversion-status= %install
