From dc9e356cd598b58fb12bcc37aea02a88fc390c0c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:53 +0200 Subject: [PATCH 01/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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 ff1edde4a9e9387810a2d3fd10e8fcaef9dfb742 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 25 Aug 2020 09:29:24 +0200 Subject: [PATCH 08/10] 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 9108d6f50717a09f5479eb5feb23edb20e7b081f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 09/10] 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 10/10] 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