diff --git a/.gitignore b/.gitignore index f5c3b23..32d5682 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /testng-7.4.0.tar.gz /testng-7.6.1.tar.gz /testng-7.6.1.pom +/testng-7.8.0.tar.gz +/testng-7.8.0.pom diff --git a/sources b/sources index 8a292a1..1d90842 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (testng-7.6.1.tar.gz) = ac68ac36ef880aa6c07d50d371a0d2c1281500d78329e5397fa63e62fee097cef4763efa855c536a09dbf46e4753a65823930e5f5ed54c6171b37318c346ae66 -SHA512 (testng-7.6.1.pom) = f47d9365cc005798c8d748d66d34dd73b11d484e36d555623b0676729b47069aae2dad829deffa8b44b870d3fa5296fa44258edcede1a8062582cecc2926e5a1 +SHA512 (testng-7.8.0.tar.gz) = 845fd50bc94e0dac560a6dacd7fcf1cdc1dba870fd73c7fe89342460325c02f02e13a407d4dacf1328723b3c9fefa778b67f2e27208858c629e391cb1e3b4333 +SHA512 (testng-7.8.0.pom) = 1f203073eea51a187824e7096a9eb0fd5df7b76ebfe65fa49037b28826dda216f75e73ed352ce4af645389cbbd2d72ccbf2a1fe9ccafe0d5daddcab4ed6d3959 diff --git a/testng.spec b/testng.spec index 447d67a..99439e0 100644 --- a/testng.spec +++ b/testng.spec @@ -1,11 +1,11 @@ %bcond_with bootstrap Name: testng -Version: 7.6.1 -Release: 5%{?dist} +Version: 7.8.0 +Release: 1%{?dist} Summary: Java-based testing framework License: Apache-2.0 -URL: http://testng.org/ +URL: https://testng.org/doc/ # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz @@ -51,17 +51,17 @@ This package contains the API documentation for %{name}. cp %{SOURCE1} pom.xml -%patch0 -p1 -%patch1 -p1 +%patch 0 -p1 +%patch 1 -p1 # Contains differently licensed sources -rm -rf testng-test-osgi +rm -r testng-test-osgi -find . -mindepth 2 -name src -type d -exec cp -r -t . {} + +find . -mindepth 2 -name 'src' -type d -exec cp -r -t . {} + # remove any bundled libs, but not test resources -find ! -path "*/test/*" -name *.jar -print -delete -find -name *.class -delete +find ! -path '*/test/*' -name '*.jar' -print -delete +find -name '*.class' -delete %pom_remove_dep org.webjars:jquery @@ -77,7 +77,7 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %build # Tests extend a class written in Kotlin -%mvn_build -f -- -Dmaven.compiler.source=8 -Dmaven.compiler.target=8 +%mvn_build -f -- -Dmaven.compiler.release=11 %install %mvn_install @@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Thu Aug 17 2023 Marian Koncek - 7.8.0-1 +- Update to upstream version 7.8.0 + * Sat Jul 22 2023 Fedora Release Engineering - 7.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild