diff --git a/.gitignore b/.gitignore index 9978b35..16d3109 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /jsoup-1.16.1.tar.gz /jsoup-1.17.2.tar.gz /jsoup-1.18.1.tar.gz +/jsoup-1.19.1.tar.gz +/jsoup-1.21.1.tar.gz diff --git a/jsoup.spec b/jsoup.spec index 79bfeff..fa42763 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: jsoup -Version: 1.18.1 +Version: 1.21.1 Release: %autorelease Summary: Java library for working with real-world HTML License: MIT @@ -18,10 +18,12 @@ BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.18.1-11 %description jsoup is a Java library for working with real-world HTML. It provides a very @@ -40,12 +42,6 @@ jsoup is designed to deal with all varieties of HTML found in the wild; from pristine and validating, to invalid tag-soup; jsoup will create a sensible parse tree. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -61,12 +57,12 @@ API documentation for %{name}. # Remove jspecify annotations which are used for static analysis only %pom_remove_dep :jspecify -sed -i /org.jspecify/d src/main/java9/module-info.java -%java_remove_annotations src/main/java -s \ +sed -i /org.jspecify/d src/main/java*/module-info.java +%java_remove_annotations src/main/java src/main/java11 -s \ -p org[.]jspecify[.]annotations[.] \ %build -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -75,7 +71,5 @@ sed -i /org.jspecify/d src/main/java9/module-info.java %doc README.md CHANGES.md %license LICENSE -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: f42 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 execute: how: tmt diff --git a/sources b/sources index 0ea4c54..5352311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.18.1.tar.gz) = 290483fe015870e8163f11a7e49ab9e5e411a3654d46e04e10f08589efb432890fa61e2f434907f053bed9debefec6b0f843370ac270007201eb434153024f46 +SHA512 (jsoup-1.21.1.tar.gz) = 64c713ef487f3283199769655ded7501b80b583e09d7aee93d80912320c79ee2c5224fc4ae23e96f13949a224849d65f9171b3f7932b44dd8a8bc536b4967d22