Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package testng for openSUSE:Factory checked in at 2024-02-22 20:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/testng (Old) and /work/SRC/openSUSE:Factory/.testng.new.1706 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "testng" Thu Feb 22 20:56:42 2024 rev:5 rq:1148817 version:7.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/testng/testng.changes 2022-11-22 16:11:03.634297150 +0100 +++ /work/SRC/openSUSE:Factory/.testng.new.1706/testng.changes 2024-02-22 20:56:43.247237617 +0100 @@ -1,0 +2,5 @@ +Wed Feb 21 17:12:29 UTC 2024 - Fridrich Strba <[email protected]> + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ testng.spec ++++++ --- /var/tmp/diff_new_pack.sfEUVG/_old 2024-02-22 20:56:43.999265025 +0100 +++ /var/tmp/diff_new_pack.sfEUVG/_new 2024-02-22 20:56:44.003265170 +0100 @@ -1,7 +1,7 @@ # # spec file for package testng # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,12 +34,10 @@ BuildRequires: bsh2 BuildRequires: fdupes BuildRequires: google-guice -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jsr-305 BuildRequires: junit BuildRequires: snakeyaml -Requires: mvn(com.beust:jcommander) -Requires: mvn(org.yaml:snakeyaml) BuildArch: noarch %description @@ -58,9 +56,9 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 sed 's/@VERSION@/%{version}/' %{SOURCE1} > pom.xml cp %{SOURCE2} build.xml @@ -69,18 +67,10 @@ find ! -path "*/test/*" -name *.jar -print -delete find -name *.class -delete -# these are unnecessary -%pom_remove_plugin :maven-gpg-plugin . -%pom_remove_plugin :maven-source-plugin . -%pom_remove_plugin :maven-javadoc-plugin . - sed -i -e 's/DEV-SNAPSHOT/%{version}/' src/main/java/org/testng/internal/Version.java cp -p ./src/main/java/*.dtd.html ./src/main/resources/. -# jdk15 classifier is used by some other packages -%{mvn_alias} : :::jdk15: - %build mkdir -p lib build-jar-repository -s lib ant/ant beust-jcommander bsh2/bsh google-guice jsr305 junit snakeyaml @@ -93,7 +83,7 @@ # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar -a org.testng:testng::jdk15: # javadoc
