diff --git a/.gitignore b/.gitignore index 21e07cf..046b5ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jsoup-1.12.1.tar.gz +SOURCES/jsoup-1.18.1.tar.gz diff --git a/.jsoup.metadata b/.jsoup.metadata index 541bedf..2c5b6c2 100644 --- a/.jsoup.metadata +++ b/.jsoup.metadata @@ -1 +1 @@ -48adc12dca7887f3d93c5680ce94194ab0a312a4 SOURCES/jsoup-1.12.1.tar.gz +4e04ee4e011079c2b5ad286b842d597be8009aa2 SOURCES/jsoup-1.18.1.tar.gz diff --git a/SOURCES/generate-tarball.sh b/SOURCES/generate-tarball.sh index 782770d..49786ce 100755 --- a/SOURCES/generate-tarball.sh +++ b/SOURCES/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 -tar xf "../${name}-${version}.orig.tar.gz" +pushd tarball-tmp +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 cf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/SPECS/jsoup.spec b/SPECS/jsoup.spec index 07072bd..8e12c89 100644 --- a/SPECS/jsoup.spec +++ b/SPECS/jsoup.spec @@ -1,46 +1,69 @@ +%bcond_with bootstrap + Name: jsoup -Version: 1.12.1 -Release: 3%{?dist} +Version: 1.18.1 +Release: 8%{?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 # The sources contain non-free scraped web pages as test data Source1: generate-tarball.sh -BuildRequires: maven-local-openjdk8 +BuildRequires: jurand +%if %{with bootstrap} +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 %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. +%package javadoc +Summary: API documentation for %{name} -%{?module_package} -%{?javadoc_package} +%description javadoc +API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%autosetup -p1 -n %{name}-%{name}-%{version} %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 +%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 @@ -48,23 +71,95 @@ jsoup will create a sensible parse tree. %install %mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles -%doc README.md CHANGES +%files -f .mfiles +%doc README.md CHANGES.md %license LICENSE +%files javadoc -f .mfiles-javadoc + %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.18.1-6 +- Update javapackages test plan to f42 + +* 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