From dc9e356cd598b58fb12bcc37aea02a88fc390c0c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:53 +0200 Subject: [PATCH 01/53] Mass rebuild for javapackages-tools 201901 --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 0d7ffe2..394510d 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,6 +1,6 @@ Name: jsoup Version: 1.11.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -60,6 +60,9 @@ API documentation for %{name}. %license LICENSE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.11.3-4 +- Mass rebuild for javapackages-tools 201901 + * Wed Jul 18 2018 Michael Simacek - 1.11.3-3 - Remove non-free scraped web pages from SRPM From 4996109293c134c0f5b0cc7e4e69d8bba55d0ee4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:13:35 +0200 Subject: [PATCH 02/53] Use javadoc_package macro --- jsoup.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/jsoup.spec b/jsoup.spec index 394510d..0bbaa61 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -33,12 +33,7 @@ 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: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. +%{?javadoc_package} %prep %setup -q -n %{name}-%{name}-%{version} @@ -56,9 +51,6 @@ API documentation for %{name}. %doc README.md CHANGES %license LICENSE -%files javadoc -f .mfiles-javadoc -%license LICENSE - %changelog * Fri May 24 2019 Mikolaj Izdebski - 1.11.3-4 - Mass rebuild for javapackages-tools 201901 From d5fad3e4391e0371da72d9a34ff7df2a929d6852 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:13:58 +0200 Subject: [PATCH 03/53] Declare module package --- jsoup.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 0bbaa61..5f375a8 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -33,6 +33,7 @@ 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. +%{?module_package} %{?javadoc_package} %prep @@ -47,7 +48,7 @@ jsoup will create a sensible parse tree. %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %doc README.md CHANGES %license LICENSE From 73bd108e22002cadfb4710f47968c2b5035d5939 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 4 Jul 2019 10:08:31 +0200 Subject: [PATCH 04/53] Update to upstream version 1.12.1 --- .gitignore | 1 + jsoup.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 070dc2c..e2c680a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /jsoup-1.11.1.tar.gz /jsoup-1.11.2.tar.gz /jsoup-1.11.3.tar.gz +/jsoup-1.12.1.tar.gz diff --git a/jsoup.spec b/jsoup.spec index 5f375a8..deab26d 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,6 +1,6 @@ Name: jsoup -Version: 1.11.3 -Release: 4%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -53,6 +53,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* 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 diff --git a/sources b/sources index 9ed937a..7263baf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.11.3.tar.gz) = d7a980a180a42708c4860f0df085f37831d94ce17e57be0333b6315b25cac3c94b1e965e97eae6e70786aee8263e843d746905b98919eba512c0a9bf67de41b9 +SHA512 (jsoup-1.12.1.tar.gz) = fd6c6799ce00b1bf2a87b5445813f1eed4a726ad1405349a3410492903a6158c5e9cfecf7c238416bf185da68cfd97b1d7f448f9e8aaa9a4d77d145498dfc90f From d7def7196db0dd0c8d3058f7a3ea260e02959705 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 05/53] Mass rebuild for javapackages-tools 201902 --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index deab26d..b14d700 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,6 +1,6 @@ Name: jsoup Version: 1.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -53,6 +53,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.12.1-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 04 2019 Marian Koncek - 1.12.1-1 - Update to upstream version 1.12.1 From 1908562ef53a3149a22bc37d71bcabc5b8fa9732 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 06/53] Build with OpenJDK 8 --- jsoup.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jsoup.spec b/jsoup.spec index b14d700..07072bd 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,6 +1,6 @@ Name: jsoup Version: 1.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -11,7 +11,7 @@ Source0: %{name}-%{version}.tar.gz # The sources contain non-free scraped web pages as test data Source1: generate-tarball.sh -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %description @@ -53,6 +53,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* 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 From 38e3a0874b4370e9b8d2902dfe0ecf58fd81780e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Jan 2020 16:28:30 +0100 Subject: [PATCH 07/53] Properly compress tarballs --- generate-tarball.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 782770d..b3a670f 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -9,13 +9,13 @@ wget "https://github.com/jhy/${name}/archive/${name}-${version}.tar.gz" -O "${na rm -rf tarball-tmp mkdir tarball-tmp -cd tarball-tmp +pushd tarball-tmp tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL # contains scraped news articles (non-free) rm -r */src/test/resources -tar cf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" From 5368baa2aa517bbb1f8db234e540790b5587db26 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 14 May 2020 13:32:36 +0200 Subject: [PATCH 08/53] update to version 1.13.1 --- .gitignore | 1 + jsoup.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bda4f73..aaf5ddc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /jsoup-1.11.2.tar.gz /jsoup-1.11.3.tar.gz /jsoup-1.12.1.tar.gz +/jsoup-1.13.1.tar.gz diff --git a/jsoup.spec b/jsoup.spec index f4cabce..8b984db 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ Name: jsoup Summary: Java library for working with real-world HTML -Version: 1.12.1 -Release: 2%{?dist} +Version: 1.13.1 +Release: 1%{?dist} License: MIT URL: http://jsoup.org/ @@ -46,6 +46,7 @@ API documentation for %{name}. %setup -q -n %{name}-%{name}-%{version} %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-failsafe-plugin %pom_remove_plugin :maven-javadoc-plugin %build @@ -62,6 +63,9 @@ API documentation for %{name}. %license LICENSE %changelog +* 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 diff --git a/sources b/sources index ce05629..583d3d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.12.1.tar.gz) = 7221af6033edc1876e265d6cf07958a0a5b1fa029a3c1a0e0ae594daed0fc3f1cc4d6c1bf1b23252f15bdddb133f3b5260396e776cf5ea32295694ae2c170c5b +SHA512 (jsoup-1.13.1.tar.gz) = e8b0b123a6fada1e62ee4d11b01aad82fddbf7704be63ee475a9c49096469c7307f5724f3ceb9cdc2a1e0bbac2873cd3b4322ab13c98515df9c94249fd913896 From 54cf09582bf6c68386fb34ad19468992924d7c66 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 01:17:59 +0200 Subject: [PATCH 09/53] Rebuilt for JDK-11 --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 8b984db..da5b4a3 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ Name: jsoup Summary: Java library for working with real-world HTML Version: 1.13.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://jsoup.org/ @@ -63,6 +63,9 @@ API documentation for %{name}. %license LICENSE %changelog +* 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. From bebcde2eb019c4202e06bc83269447641459c707 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:36:04 +0000 Subject: [PATCH 10/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index da5b4a3..335731c 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ Name: jsoup Summary: Java library for working with real-world HTML Version: 1.13.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://jsoup.org/ @@ -63,6 +63,9 @@ API documentation for %{name}. %license LICENSE %changelog +* 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 From ff1edde4a9e9387810a2d3fd10e8fcaef9dfb742 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 25 Aug 2020 09:29:24 +0200 Subject: [PATCH 11/53] Update to upstream version 1.13.1 --- .gitignore | 1 + generate-tarball.sh | 4 ++-- jsoup.spec | 8 ++++++-- sources | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e2c680a..970f570 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /jsoup-1.11.2.tar.gz /jsoup-1.11.3.tar.gz /jsoup-1.12.1.tar.gz +/jsoup-1.13.1.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh index b3a670f..49786ce 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -10,11 +10,11 @@ wget "https://github.com/jhy/${name}/archive/${name}-${version}.tar.gz" -O "${na rm -rf tarball-tmp mkdir tarball-tmp pushd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +tar -xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL # contains scraped news articles (non-free) -rm -r */src/test/resources +rm -r "${name}-${name}-${version}/src/test/resources" tar -czf "../${name}-${version}.tar.gz" * popd diff --git a/jsoup.spec b/jsoup.spec index 07072bd..6114bd2 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,6 +1,6 @@ Name: jsoup -Version: 1.12.1 -Release: 3%{?dist} +Version: 1.13.1 +Release: 1%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -40,6 +40,7 @@ jsoup will create a sensible parse tree. %setup -q -n %{name}-%{name}-%{version} %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-failsafe-plugin %pom_remove_plugin :maven-javadoc-plugin %build @@ -53,6 +54,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* Tue Aug 25 2020 Marian Koncek - 1.13.1-1 +- Update to upstream version 1.13.1 + * Sat Jan 25 2020 Mikolaj Izdebski - 1.12.1-3 - Build with OpenJDK 8 diff --git a/sources b/sources index 7263baf..df80e4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.12.1.tar.gz) = fd6c6799ce00b1bf2a87b5445813f1eed4a726ad1405349a3410492903a6158c5e9cfecf7c238416bf185da68cfd97b1d7f448f9e8aaa9a4d77d145498dfc90f +SHA512 (jsoup-1.13.1.tar.gz) = b00bf53e2692e01a32870579d259b0bc7c78a7d13e44975f6692b9f92852224a0f5d3631b59eeaf41e00c2ccdc097983ba836eca62b998cb332b91fa9c713dd6 From fe1e210229c4da7343a1c1fdfb7bab8083392bc8 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 28 Aug 2020 13:53:22 +0100 Subject: [PATCH 12/53] Expose internal packages in the OSGi metadata --- jsoup.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 335731c..9558c37 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ Name: jsoup Summary: Java library for working with real-world HTML Version: 1.13.1 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://jsoup.org/ @@ -49,6 +49,11 @@ API documentation for %{name}. %pom_remove_plugin :maven-failsafe-plugin %pom_remove_plugin :maven-javadoc-plugin +# Expose internal packages in the OSGi metadata, clearly marking them as such +# using the x-internal attribute +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" \ + "<_exportcontents>*.internal;x-internal:=true,*" + %build %mvn_build -f @@ -63,6 +68,9 @@ API documentation for %{name}. %license LICENSE %changelog +* Fri Aug 28 2020 Mat Booth - 1.13.1-4 +- Expose internal packages in the OSGi metadata + * Tue Jul 28 2020 Fedora Release Engineering - 1.13.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c00a3c45ce40fca6a575c9824169bcb7933d47d6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 28 Aug 2020 13:53:22 +0100 Subject: [PATCH 13/53] Expose internal packages in the OSGi metadata --- jsoup.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index f4cabce..81d72ac 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ Name: jsoup Summary: Java library for working with real-world HTML Version: 1.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://jsoup.org/ @@ -48,6 +48,11 @@ API documentation for %{name}. %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-javadoc-plugin +# Expose internal packages in the OSGi metadata, clearly marking them as such +# using the x-internal attribute +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" \ + "<_exportcontents>*.internal;x-internal:=true,*" + %build %mvn_build -f @@ -62,6 +67,9 @@ API documentation for %{name}. %license LICENSE %changelog +* Fri Aug 28 2020 Mat Booth - 1.12.1-3 +- Expose internal packages in the OSGi metadata + * Wed Jan 29 2020 Fedora Release Engineering - 1.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e568d300567859d2e5cd61788c0af3021565a4e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:04:42 +0000 Subject: [PATCH 14/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 9558c37..ebc56d1 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ Name: jsoup Summary: Java library for working with real-world HTML Version: 1.13.1 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: http://jsoup.org/ @@ -68,6 +68,9 @@ API documentation for %{name}. %license LICENSE %changelog +* 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 From 9108d6f50717a09f5479eb5feb23edb20e7b081f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 15/53] Conditionalize buildrequires in bootstrap mode --- jsoup.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jsoup.spec b/jsoup.spec index 6114bd2..95ec8f0 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: jsoup Version: 1.13.1 Release: 1%{?dist} @@ -12,7 +14,11 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +%endif %description jsoup is a Java library for working with real-world HTML. From d3707978ca35be59fbfb4ab034e24f1e8e289aa2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 16/53] Turn off bootstrap mode by default --- jsoup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 95ec8f0..7a99d0d 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: jsoup Version: 1.13.1 From 306434dda042b79447a30ec9cc202baef0b3f7f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:55 +0200 Subject: [PATCH 17/53] Bootstrap build --- jsoup.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jsoup.spec b/jsoup.spec index bf8220c..0c91328 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: jsoup Version: 1.13.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -65,6 +65,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1.13.1-6 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1.13.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2728e87a08f48d96a60159c719fbf755bb72c5be Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:44 +0200 Subject: [PATCH 18/53] Non-bootstrap build --- jsoup.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 0c91328..e0f57b7 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: jsoup Version: 1.13.1 @@ -67,6 +67,7 @@ jsoup will create a sensible parse tree. %changelog * 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 From 7bce9cca733b600026e2dad66f8f5898784579a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:19:23 +0000 Subject: [PATCH 19/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index e0f57b7..83a14e1 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.13.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -65,6 +65,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* 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 From 0e6887ad9ef54e948d75e831f6fb6ad1ae3a99ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:01:33 +0000 Subject: [PATCH 20/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 83a14e1..b42ebac 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.13.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -65,6 +65,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* 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 From 79648f0ad6ebc2ed6b02b422705c54b08515836d Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 22:06:04 +0100 Subject: [PATCH 21/53] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index b42ebac..9853cb3 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.13.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: http://jsoup.org/ @@ -65,6 +65,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* 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 From 2ca937d360ecba74c1a4589299330585b74ee60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 6 Jun 2022 09:27:06 +0200 Subject: [PATCH 22/53] Orphaned for 6+ weeks --- .gitignore | 18 ---- dead.package | 1 + generate-tarball.sh | 21 ----- jsoup.spec | 212 -------------------------------------------- sources | 1 - 5 files changed, 1 insertion(+), 252 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100755 generate-tarball.sh delete mode 100644 jsoup.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index aaf5ddc..0000000 --- a/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -/results_* -/*.src.rpm - -/jsoup-1.6.1.tar.xz -/jsoup-jsoup-1.7.2.tar.gz -/jsoup-1.8.1.a.tar.gz -/jsoup-1.8.2.tar.gz -/jsoup-1.8.3.tar.gz -/jsoup-1.9.1.tar.gz -/jsoup-1.9.2.tar.gz -/jsoup-1.10.1.tar.gz -/jsoup-1.10.2.tar.gz -/jsoup-1.10.3.tar.gz -/jsoup-1.11.1.tar.gz -/jsoup-1.11.2.tar.gz -/jsoup-1.11.3.tar.gz -/jsoup-1.12.1.tar.gz -/jsoup-1.13.1.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 49786ce..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -e - -name=jsoup -version="$(sed -n 's/Version:\s*//p' *.spec)" - -# RETRIEVE -wget "https://github.com/jhy/${name}/archive/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" - -rm -rf tarball-tmp -mkdir tarball-tmp -pushd tarball-tmp -tar -xf "../${name}-${version}.orig.tar.gz" - -# CLEAN TARBALL -# contains scraped news articles (non-free) -rm -r "${name}-${name}-${version}/src/test/resources" - -tar -czf "../${name}-${version}.tar.gz" * -popd -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/jsoup.spec b/jsoup.spec deleted file mode 100644 index 9853cb3..0000000 --- a/jsoup.spec +++ /dev/null @@ -1,212 +0,0 @@ -%bcond_with bootstrap - -Name: jsoup -Version: 1.13.1 -Release: 9%{?dist} -Summary: Java library for working with real-world HTML -License: MIT -URL: http://jsoup.org/ -BuildArch: noarch - -# ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz -# The sources contain non-free scraped web pages as test data -Source1: generate-tarball.sh - -BuildRequires: maven-local-openjdk8 -%if %{with bootstrap} -BuildRequires: javapackages-bootstrap -%else -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -%endif - -%description -jsoup is a Java library for working with real-world HTML. -It provides a very convenient API for extracting and manipulating data, -using the best of DOM, CSS, and jquery-like methods. - -jsoup implements the WHATWG HTML5 specification, -and parses HTML to the same DOM as modern browsers do. - - - scrape and parse HTML from a URL, file, or string - - find and extract data, using DOM traversal or CSS selectors - - manipulate the HTML elements, attributes, and text - - clean user-submitted content against a safe white-list, - to prevent XSS attacks - - output tidy HTML - -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. - -%{?module_package} -%{?javadoc_package} - -%prep -%setup -q -n %{name}-%{name}-%{version} - -%pom_remove_plugin :animal-sniffer-maven-plugin -%pom_remove_plugin :maven-failsafe-plugin -%pom_remove_plugin :maven-javadoc-plugin - -# Expose internal packages in the OSGi metadata, clearly marking them as such -# using the x-internal attribute -%pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" \ - "<_exportcontents>*.internal;x-internal:=true,*" - -%build -%mvn_build -f - -%install -%mvn_install - -%files -n %{?module_prefix}%{name} -f .mfiles -%doc README.md CHANGES -%license LICENSE - -%changelog -* 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/sources b/sources deleted file mode 100644 index df80e4e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (jsoup-1.13.1.tar.gz) = b00bf53e2692e01a32870579d259b0bc7c78a7d13e44975f6692b9f92852224a0f5d3631b59eeaf41e00c2ccdc097983ba836eca62b998cb332b91fa9c713dd6 From 857cade81420f3486738c8a57c657c5cc3a352f1 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 25 Jul 2023 07:41:32 +0200 Subject: [PATCH 23/53] Unretirement request: https://pagure.io/releng/issue/11561 --- .gitignore | 18 ++++ dead.package | 1 - generate-tarball.sh | 21 +++++ jsoup.spec | 212 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 252 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100755 generate-tarball.sh create mode 100644 jsoup.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aaf5ddc --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +/results_* +/*.src.rpm + +/jsoup-1.6.1.tar.xz +/jsoup-jsoup-1.7.2.tar.gz +/jsoup-1.8.1.a.tar.gz +/jsoup-1.8.2.tar.gz +/jsoup-1.8.3.tar.gz +/jsoup-1.9.1.tar.gz +/jsoup-1.9.2.tar.gz +/jsoup-1.10.1.tar.gz +/jsoup-1.10.2.tar.gz +/jsoup-1.10.3.tar.gz +/jsoup-1.11.1.tar.gz +/jsoup-1.11.2.tar.gz +/jsoup-1.11.3.tar.gz +/jsoup-1.12.1.tar.gz +/jsoup-1.13.1.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..49786ce --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -e + +name=jsoup +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://github.com/jhy/${name}/archive/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +# contains scraped news articles (non-free) +rm -r "${name}-${name}-${version}/src/test/resources" + +tar -czf "../${name}-${version}.tar.gz" * +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/jsoup.spec b/jsoup.spec new file mode 100644 index 0000000..9853cb3 --- /dev/null +++ b/jsoup.spec @@ -0,0 +1,212 @@ +%bcond_with bootstrap + +Name: jsoup +Version: 1.13.1 +Release: 9%{?dist} +Summary: Java library for working with real-world HTML +License: MIT +URL: http://jsoup.org/ +BuildArch: noarch + +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz +# The sources contain non-free scraped web pages as test data +Source1: generate-tarball.sh + +BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +%endif + +%description +jsoup is a Java library for working with real-world HTML. +It provides a very convenient API for extracting and manipulating data, +using the best of DOM, CSS, and jquery-like methods. + +jsoup implements the WHATWG HTML5 specification, +and parses HTML to the same DOM as modern browsers do. + + - scrape and parse HTML from a URL, file, or string + - find and extract data, using DOM traversal or CSS selectors + - manipulate the HTML elements, attributes, and text + - clean user-submitted content against a safe white-list, + to prevent XSS attacks + - output tidy HTML + +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. + +%{?module_package} +%{?javadoc_package} + +%prep +%setup -q -n %{name}-%{name}-%{version} + +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-failsafe-plugin +%pom_remove_plugin :maven-javadoc-plugin + +# Expose internal packages in the OSGi metadata, clearly marking them as such +# using the x-internal attribute +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" \ + "<_exportcontents>*.internal;x-internal:=true,*" + +%build +%mvn_build -f + +%install +%mvn_install + +%files -n %{?module_prefix}%{name} -f .mfiles +%doc README.md CHANGES +%license LICENSE + +%changelog +* 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/sources b/sources new file mode 100644 index 0000000..df80e4e --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (jsoup-1.13.1.tar.gz) = b00bf53e2692e01a32870579d259b0bc7c78a7d13e44975f6692b9f92852224a0f5d3631b59eeaf41e00c2ccdc097983ba836eca62b998cb332b91fa9c713dd6 From 68f38607f11667d7099ede592d59476eff040118 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 25 Jul 2023 10:11:19 +0200 Subject: [PATCH 24/53] Update to upstream 1.16.1 License fields is already in SPDX format --- .gitignore | 1 + jsoup.spec | 39 +++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index aaf5ddc..c91c79e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /jsoup-1.11.3.tar.gz /jsoup-1.12.1.tar.gz /jsoup-1.13.1.tar.gz +/jsoup-1.16.1.tar.gz diff --git a/jsoup.spec b/jsoup.spec index 9853cb3..c21c203 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,12 +1,13 @@ %bcond_with bootstrap Name: jsoup -Version: 1.13.1 -Release: 9%{?dist} +Version: 1.16.1 +Release: 1%{?dist} Summary: Java library for working with real-world HTML License: MIT -URL: http://jsoup.org/ +URL: https://jsoup.org/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz @@ -21,23 +22,21 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %endif %description -jsoup is a Java library for working with real-world HTML. -It provides a very convenient API for extracting and manipulating data, -using the best of DOM, CSS, and jquery-like methods. +jsoup is a Java library for working with real-world HTML. It provides a very +convenient API for fetching URLs and extracting and manipulating data, using the +best of HTML5 DOM methods and CSS selectors. -jsoup implements the WHATWG HTML5 specification, -and parses HTML to the same DOM as modern browsers do. +jsoup implements the WHATWG HTML5 specification, and parses HTML to the same DOM +as modern browsers do. +* scrape and parse HTML from a URL, file, or string +* find and extract data, using DOM traversal or CSS selectors +* manipulate the HTML elements, attributes, and text +* clean user-submitted content against a safelist, to prevent XSS attacks +* output tidy HTML - - scrape and parse HTML from a URL, file, or string - - find and extract data, using DOM traversal or CSS selectors - - manipulate the HTML elements, attributes, and text - - clean user-submitted content against a safe white-list, - to prevent XSS attacks - - output tidy HTML - -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. +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. %{?module_package} %{?javadoc_package} @@ -48,6 +47,7 @@ jsoup will create a sensible parse tree. %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-failsafe-plugin %pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin com.github.siom79.japicmp:japicmp-maven-plugin # Expose internal packages in the OSGi metadata, clearly marking them as such # using the x-internal attribute @@ -65,6 +65,9 @@ jsoup will create a sensible parse tree. %license LICENSE %changelog +* 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 diff --git a/sources b/sources index df80e4e..cd763de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.13.1.tar.gz) = b00bf53e2692e01a32870579d259b0bc7c78a7d13e44975f6692b9f92852224a0f5d3631b59eeaf41e00c2ccdc097983ba836eca62b998cb332b91fa9c713dd6 +SHA512 (jsoup-1.16.1.tar.gz) = e42dd69686e24a50cfb06c6607ab401545a176d4927454a29c73a441a118b9dd83a34dfd29e12c15f3f54249e818ff525fd00d60255c4dc7ad03c187c27d9a07 From 688f41b65d4b0cb9186fae9cfe630655fa57f11a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 25 Jul 2023 10:15:27 +0200 Subject: [PATCH 25/53] Add javapackages test plan --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..0cbb629 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f39 +execute: + how: tmt From b6c1b13bb9f72ccb73c887db9f5ea2058f0420ee Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 9 Aug 2023 16:37:53 +0200 Subject: [PATCH 26/53] Fix bootstrap BuildRequires --- jsoup.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsoup.spec b/jsoup.spec index c21c203..640b332 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -14,10 +14,10 @@ Source0: %{name}-%{version}.tar.gz # The sources contain non-free scraped web pages as test data Source1: generate-tarball.sh -BuildRequires: maven-local-openjdk8 %if %{with bootstrap} -BuildRequires: javapackages-bootstrap +BuildRequires: javapackages-bootstrap-openjdk8 %else +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %endif From bd663d055da67a80e8aa75c546aa89004670759e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 15 Aug 2023 10:22:09 +0200 Subject: [PATCH 27/53] Build with default JDK 17 --- jsoup.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jsoup.spec b/jsoup.spec index 640b332..2f39c35 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: https://jsoup.org/ @@ -15,9 +15,9 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 +BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %endif @@ -65,6 +65,9 @@ tree. %license LICENSE %changelog +* 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 From ab12d06950e9442a4300302aa3c304276ed74b65 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 15:58:53 +0200 Subject: [PATCH 28/53] Bootstrap build --- jsoup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 2f39c35..d2702fe 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: jsoup Version: 1.16.1 From b742e677d81146255fe53f283f7fd23bd7897830 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 16:22:35 +0200 Subject: [PATCH 29/53] Non-bootstrap build --- jsoup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index d2702fe..2f39c35 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: jsoup Version: 1.16.1 From 772a0f1e7a38e98f9cdf52016329ef8b394191e4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 14:00:28 +0200 Subject: [PATCH 30/53] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 From 9025b381e57c148f22ed6e534caae9b6fd879bd3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 31/53] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 0cbb629..a2cdaba 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: f39 + ref: f40 execute: how: tmt From 1c7dd764f4dae65bcfdd776086c42f911c03be61 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 13 Dec 2023 06:11:05 +0100 Subject: [PATCH 32/53] Get rid of module_prefix macro --- jsoup.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jsoup.spec b/jsoup.spec index 2f39c35..a7036f0 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -38,7 +38,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. -%{?module_package} %{?javadoc_package} %prep @@ -60,7 +59,7 @@ tree. %install %mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles +%files -f .mfiles %doc README.md CHANGES %license LICENSE From d5cf409a9ff45c063ed0aa6421c8e699e7b9d779 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:50:29 +0000 Subject: [PATCH 33/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index a7036f0..a8fa563 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.16.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: https://jsoup.org/ @@ -64,6 +64,9 @@ tree. %license LICENSE %changelog +* 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 From a9296d13670137e781a968e048ac3dcfe7a6335a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:30:30 +0000 Subject: [PATCH 34/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index a8fa563..0038cf9 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.16.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: https://jsoup.org/ @@ -64,6 +64,9 @@ tree. %license LICENSE %changelog +* 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 From 20c75ef161808664a9fff12caab541bf6813dd00 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Feb 2024 10:32:31 +0100 Subject: [PATCH 35/53] Update to upstream version 1.17.2 --- .gitignore | 1 + jsoup.spec | 17 ++++++++++++++--- sources | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c91c79e..c613a96 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /jsoup-1.12.1.tar.gz /jsoup-1.13.1.tar.gz /jsoup-1.16.1.tar.gz +/jsoup-1.17.2.tar.gz diff --git a/jsoup.spec b/jsoup.spec index 0038cf9..f786bfd 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: jsoup -Version: 1.16.1 -Release: 4%{?dist} +Version: 1.17.2 +Release: 1%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: https://jsoup.org/ @@ -19,7 +19,9 @@ BuildRequires: javapackages-bootstrap %else 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 @@ -53,6 +55,12 @@ tree. %pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" \ "<_exportcontents>*.internal;x-internal:=true,*" +# 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 \ + -p org[.]jspecify[.]annotations[.] \ + %build %mvn_build -f @@ -60,10 +68,13 @@ tree. %mvn_install %files -f .mfiles -%doc README.md CHANGES +%doc README.md CHANGES.md %license LICENSE %changelog +* 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 diff --git a/sources b/sources index cd763de..acc7725 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.16.1.tar.gz) = e42dd69686e24a50cfb06c6607ab401545a176d4927454a29c73a441a118b9dd83a34dfd29e12c15f3f54249e818ff525fd00d60255c4dc7ad03c187c27d9a07 +SHA512 (jsoup-1.17.2.tar.gz) = 0d76e0478f7972e6789ac60d5bdedc114bacd233a073adc1527cb5e42b660fdac4f96b7e1f54e787fbe36d54ac09e73b3ac53ccccc3f242bb150da0164402ed6 From e50967f41c40caeaa042ae9dd86eef579aaaf18e Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:23:38 +0100 Subject: [PATCH 36/53] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index f786bfd..95295bd 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: https://jsoup.org/ @@ -72,6 +72,9 @@ sed -i /org.jspecify/d src/main/java9/module-info.java %license LICENSE %changelog +* 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 From 20d040139064301a4ed200b99425c8c7d6a825ce Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 15 Jul 2024 12:41:38 +0200 Subject: [PATCH 37/53] Update to upstream version 1.18.1 --- .gitignore | 1 + jsoup.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c613a96..9978b35 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /jsoup-1.13.1.tar.gz /jsoup-1.16.1.tar.gz /jsoup-1.17.2.tar.gz +/jsoup-1.18.1.tar.gz diff --git a/jsoup.spec b/jsoup.spec index 95295bd..3022460 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: jsoup -Version: 1.17.2 -Release: 2%{?dist} +Version: 1.18.1 +Release: 1%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: https://jsoup.org/ @@ -72,6 +72,9 @@ sed -i /org.jspecify/d src/main/java9/module-info.java %license LICENSE %changelog +* 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 diff --git a/sources b/sources index acc7725..0ea4c54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.17.2.tar.gz) = 0d76e0478f7972e6789ac60d5bdedc114bacd233a073adc1527cb5e42b660fdac4f96b7e1f54e787fbe36d54ac09e73b3ac53ccccc3f242bb150da0164402ed6 +SHA512 (jsoup-1.18.1.tar.gz) = 290483fe015870e8163f11a7e49ab9e5e411a3654d46e04e10f08589efb432890fa61e2f434907f053bed9debefec6b0f843370ac270007201eb434153024f46 From ee07cd23f29ccffcfe1d26a08387d2c5e8f8346d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:12:08 +0000 Subject: [PATCH 38/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- jsoup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 3022460..2127565 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -2,7 +2,7 @@ Name: jsoup Version: 1.18.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java library for working with real-world HTML License: MIT URL: https://jsoup.org/ @@ -72,6 +72,9 @@ 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 From 0636762aa2260a47f7e6969077d61beb462f50eb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 39/53] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 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: f40 + ref: f41 execute: how: tmt From 93aebe400aa69c20558ec1fbf76f5cf87bea9626 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 40/53] 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 41/53] 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 42/53] 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 43/53] 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 44/53] 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 45/53] 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 46/53] 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 47/53] 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 48/53] 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 49/53] 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 50/53] 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 51/53] 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 52/53] 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 53/53] 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.