From 93aebe400aa69c20558ec1fbf76f5cf87bea9626 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 01/14] Switch from %setup to %autosetup --- jsoup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 2127565..8c9b9a5 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -43,7 +43,7 @@ tree. %{?javadoc_package} %prep -%setup -q -n %{name}-%{name}-%{version} +%autosetup -p1 -C %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-failsafe-plugin From fe752ddf2471a4b85834a7146b8267c20aafc8c0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:09 +0200 Subject: [PATCH 02/14] Convert to %autorelease and %autochangelog --- changelog | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++ jsoup.spec | 172 +---------------------------------------------------- 2 files changed, 171 insertions(+), 170 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..e93419d --- /dev/null +++ b/changelog @@ -0,0 +1,169 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 1.18.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 15 2024 Marian Koncek - 1.18.1-1 +- Update to upstream version 1.18.1 + +* Fri Feb 23 2024 Jiri Vanek - 1.17.2-2 +- bump of release for for java-21-openjdk as system jdk + +* Thu Feb 01 2024 Mikolaj Izdebski - 1.17.2-1 +- Update to upstream version 1.17.2 + +* Wed Jan 24 2024 Fedora Release Engineering - 1.16.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1.16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Aug 15 2023 Mikolaj Izdebski - 1.16.1-2 +- Build with default JDK 17 + +* Mon Jul 24 2023 Marian Koncek - 1.16.1-1 +- Unretire with version 1.16.1 + +* Sat Feb 05 2022 Jiri Vanek - 1.13.1-9 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.13.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.13.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.13.1-6 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.13.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Aug 28 2020 Mat Booth - 1.13.1-4 +- Expose internal packages in the OSGi metadata + +* Tue Aug 25 2020 Marian Koncek - 1.13.1-1 +- Update to upstream version 1.13.1 + +* Tue Jul 28 2020 Fedora Release Engineering - 1.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.13.1-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu May 14 2020 Fabio Valentini - 1.13.1-1 +- Update to version 1.13.1. + +* Wed Jan 29 2020 Fedora Release Engineering - 1.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 25 2020 Mikolaj Izdebski - 1.12.1-3 +- Build with OpenJDK 8 + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.12.1-2 +- Mass rebuild for javapackages-tools 201902 + +* Sun Oct 20 2019 Fabio Valentini - 1.12.1-1 +- Update to version 1.12.1. + +* Thu Jul 25 2019 Fedora Release Engineering - 1.11.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 04 2019 Marian Koncek - 1.12.1-1 +- Update to upstream version 1.12.1 + +* Fri May 24 2019 Mikolaj Izdebski - 1.11.3-4 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.11.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jul 18 2018 Michael Simacek - 1.11.3-3 +- Remove non-free scraped web pages from SRPM + +* Fri Jul 13 2018 Fedora Release Engineering - 1.11.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Apr 19 2018 Michael Simacek - 1.11.3-1 +- Update to upstream version 1.11.3 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Nov 27 2017 Michael Simacek - 1.11.2-1 +- Update to upstream version 1.11.2 + +* Mon Nov 06 2017 Michael Simacek - 1.11.1-1 +- Update to upstream version 1.11.1 + +* Wed Jul 26 2017 Fedora Release Engineering - 1.10.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jun 15 2017 Michael Simacek - 1.10.3-1 +- Update to upstream version 1.10.3 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.10.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jan 04 2017 Michael Simacek - 1.10.2-1 +- Update to upstream version 1.10.2 + +* Wed Nov 02 2016 Michael Simacek - 1.10.1-1 +- Update to upstream version 1.10.1 + +* Tue May 24 2016 Michael Simacek - 1.9.2-1 +- Update to upstream version 1.9.2 + +* Mon Apr 18 2016 Michael Simacek - 1.9.1-1 +- Update to upstream version 1.9.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Aug 04 2015 Michael Simacek - 1.8.3-1 +- Update to upstream version 1.8.3 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Apr 14 2015 Mikolaj Izdebski - 1.8.2-1 +- Update to upstream version 1.8.2 + +* Mon Sep 29 2014 Mikolaj Izdebski - 1.8.1-1 +- Update to upstream version 1.8.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 1.7.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Mikolaj Izdebski - 1.7.2-3 +- Update to current packaging guidelines + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.7.2-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Aug 12 2013 Alexander Kurtakov 1.7.2-1 +- Update to latest upstream. + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.6.1-6 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Jul 19 2012 Fedora Release Engineering - 1.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 04 2012 Jaromir Capik - 1.6.1-4 +- Removing maven from Requires + +* Fri Jan 13 2012 Fedora Release Engineering - 1.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jul 22 2011 Jaromir Capik - 1.6.1-2 +- Switching to sources from github + +* Fri Jul 22 2011 Jaromir Capik - 1.6.1-1 +- Initial package diff --git a/jsoup.spec b/jsoup.spec index 8c9b9a5..7e93e4d 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.18.1 -Release: 2%{?dist} +Release: %autorelease Summary: Java library for working with real-world HTML License: MIT URL: https://jsoup.org/ @@ -72,172 +72,4 @@ sed -i /org.jspecify/d src/main/java9/module-info.java %license LICENSE %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 1.18.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jul 15 2024 Marian Koncek - 1.18.1-1 -- Update to upstream version 1.18.1 - -* Fri Feb 23 2024 Jiri Vanek - 1.17.2-2 -- bump of release for for java-21-openjdk as system jdk - -* Thu Feb 01 2024 Mikolaj Izdebski - 1.17.2-1 -- Update to upstream version 1.17.2 - -* Wed Jan 24 2024 Fedora Release Engineering - 1.16.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.16.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Aug 15 2023 Mikolaj Izdebski - 1.16.1-2 -- Build with default JDK 17 - -* Mon Jul 24 2023 Marian Koncek - 1.16.1-1 -- Unretire with version 1.16.1 - -* Sat Feb 05 2022 Jiri Vanek - 1.13.1-9 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 1.13.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.13.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.13.1-6 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1.13.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Aug 28 2020 Mat Booth - 1.13.1-4 -- Expose internal packages in the OSGi metadata - -* Tue Aug 25 2020 Marian Koncek - 1.13.1-1 -- Update to upstream version 1.13.1 - -* Tue Jul 28 2020 Fedora Release Engineering - 1.13.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1.13.1-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu May 14 2020 Fabio Valentini - 1.13.1-1 -- Update to version 1.13.1. - -* Wed Jan 29 2020 Fedora Release Engineering - 1.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jan 25 2020 Mikolaj Izdebski - 1.12.1-3 -- Build with OpenJDK 8 - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.12.1-2 -- Mass rebuild for javapackages-tools 201902 - -* Sun Oct 20 2019 Fabio Valentini - 1.12.1-1 -- Update to version 1.12.1. - -* Thu Jul 25 2019 Fedora Release Engineering - 1.11.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 04 2019 Marian Koncek - 1.12.1-1 -- Update to upstream version 1.12.1 - -* Fri May 24 2019 Mikolaj Izdebski - 1.11.3-4 -- Mass rebuild for javapackages-tools 201901 - -* Fri Feb 01 2019 Fedora Release Engineering - 1.11.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jul 18 2018 Michael Simacek - 1.11.3-3 -- Remove non-free scraped web pages from SRPM - -* Fri Jul 13 2018 Fedora Release Engineering - 1.11.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Apr 19 2018 Michael Simacek - 1.11.3-1 -- Update to upstream version 1.11.3 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.11.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Nov 27 2017 Michael Simacek - 1.11.2-1 -- Update to upstream version 1.11.2 - -* Mon Nov 06 2017 Michael Simacek - 1.11.1-1 -- Update to upstream version 1.11.1 - -* Wed Jul 26 2017 Fedora Release Engineering - 1.10.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jun 15 2017 Michael Simacek - 1.10.3-1 -- Update to upstream version 1.10.3 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.10.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jan 04 2017 Michael Simacek - 1.10.2-1 -- Update to upstream version 1.10.2 - -* Wed Nov 02 2016 Michael Simacek - 1.10.1-1 -- Update to upstream version 1.10.1 - -* Tue May 24 2016 Michael Simacek - 1.9.2-1 -- Update to upstream version 1.9.2 - -* Mon Apr 18 2016 Michael Simacek - 1.9.1-1 -- Update to upstream version 1.9.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.8.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Aug 04 2015 Michael Simacek - 1.8.3-1 -- Update to upstream version 1.8.3 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Apr 14 2015 Mikolaj Izdebski - 1.8.2-1 -- Update to upstream version 1.8.2 - -* Mon Sep 29 2014 Mikolaj Izdebski - 1.8.1-1 -- Update to upstream version 1.8.1 - -* Sun Jun 08 2014 Fedora Release Engineering - 1.7.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Mikolaj Izdebski - 1.7.2-3 -- Update to current packaging guidelines - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.7.2-2 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Aug 12 2013 Alexander Kurtakov 1.7.2-1 -- Update to latest upstream. - -* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 1.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.6.1-6 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Jul 19 2012 Fedora Release Engineering - 1.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Apr 04 2012 Jaromir Capik - 1.6.1-4 -- Removing maven from Requires - -* Fri Jan 13 2012 Fedora Release Engineering - 1.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Jul 22 2011 Jaromir Capik - 1.6.1-2 -- Switching to sources from github - -* Fri Jul 22 2011 Jaromir Capik - 1.6.1-1 -- Initial package +%autochangelog From f12a5273c376889e5cf8e0433b7620e38f901f30 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 03/14] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 57e103c37623fb704fcdbbd1312c56cac80c1ce1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 17:01:09 +0100 Subject: [PATCH 04/14] Sort dependencies [skip changelog] --- jsoup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 7e93e4d..1fa1363 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -14,6 +14,7 @@ Source0: %{name}-%{version}.tar.gz # The sources contain non-free scraped web pages as test data Source1: generate-tarball.sh +BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -21,7 +22,6 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) %endif -BuildRequires: jurand %description jsoup is a Java library for working with real-world HTML. It provides a very From 07ea86eae04dc5b0b8c15911d89e66e2149ccba9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 18:06:35 +0100 Subject: [PATCH 05/14] Explicitly declare javadoc subpackage [skip changelog] --- jsoup.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 1fa1363..79bfeff 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -40,7 +40,11 @@ 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. -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep %autosetup -p1 -C @@ -71,5 +75,7 @@ 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 From 170f64334e17b853a012f5732a6560abacf1d2e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:05:41 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1fddd4a9f67ca2dbc6dbe9809cd240013a22f6b5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 07/14] Remove javadoc subpackage --- jsoup.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/jsoup.spec b/jsoup.spec index 79bfeff..8a1d506 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -22,6 +22,8 @@ BuildRequires: maven-local 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 @@ -66,7 +62,7 @@ sed -i /org.jspecify/d src/main/java9/module-info.java -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 From d25720187fa2b4979ef3f8b2fb367e9f46c9b419 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 08/14] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 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 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 222795dd9fe528f6e47ad5aa96b2002e9994b763 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 09/14] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 7b9fa739ba3859c150206d1e52253800d2b37c5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 10/14] Build with OpenJDK 25 --- jsoup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 8a1d506..a03f942 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -18,7 +18,7 @@ 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 From ac394efe25bcfc877a1d6e93d8ae6e375052f58b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 16 Apr 2025 12:40:56 +0200 Subject: [PATCH 11/14] Update to upstream version 1.19.1 --- .gitignore | 1 + jsoup.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9978b35..679c9c5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /jsoup-1.16.1.tar.gz /jsoup-1.17.2.tar.gz /jsoup-1.18.1.tar.gz +/jsoup-1.19.1.tar.gz diff --git a/jsoup.spec b/jsoup.spec index a03f942..9459bdc 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: jsoup -Version: 1.18.1 +Version: 1.19.1 Release: %autorelease Summary: Java library for working with real-world HTML License: MIT @@ -57,8 +57,8 @@ tree. # 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 diff --git a/sources b/sources index 0ea4c54..6ebeca0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.18.1.tar.gz) = 290483fe015870e8163f11a7e49ab9e5e411a3654d46e04e10f08589efb432890fa61e2f434907f053bed9debefec6b0f843370ac270007201eb434153024f46 +SHA512 (jsoup-1.19.1.tar.gz) = cdee79acaf7d3fb54b80457f490e7d7845559981e392630d95a6376002cf3cc8cd8d10a8516a20a4b19f565f143aa5c10f5326b65707de5eab11f94c0b59e291 From d4f19c399b6474277d992f27c3ac8366208ebce8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 17 Jul 2025 12:27:11 +0200 Subject: [PATCH 12/14] Update to upstream version 1.21.1 --- .gitignore | 1 + jsoup.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 679c9c5..16d3109 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /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 9459bdc..fa42763 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: jsoup -Version: 1.19.1 +Version: 1.21.1 Release: %autorelease Summary: Java library for working with real-world HTML License: MIT diff --git a/sources b/sources index 6ebeca0..5352311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.19.1.tar.gz) = cdee79acaf7d3fb54b80457f490e7d7845559981e392630d95a6376002cf3cc8cd8d10a8516a20a4b19f565f143aa5c10f5326b65707de5eab11f94c0b59e291 +SHA512 (jsoup-1.21.1.tar.gz) = 64c713ef487f3283199769655ded7501b80b583e09d7aee93d80912320c79ee2c5224fc4ae23e96f13949a224849d65f9171b3f7932b44dd8a8bc536b4967d22 From 4b557a17860a1f16b55242cbfdcfa7d041773217 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:07:30 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From da67f6385d0b3a462ae099f0abaf90e060478d61 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:00:12 +0200 Subject: [PATCH 14/14] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that.