diff --git a/nekohtml.spec b/nekohtml.spec index 189d9c0..534b50a 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,10 +30,11 @@ Name: nekohtml Version: 1.9.22 -Release: 21%{?dist} +Release: 33%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: http://nekohtml.sourceforge.net/ # No upstream tarball for this release # svn export svn://svn.code.sf.net/p/nekohtml/code/branches/nekohtml-1.9.22 nekohtml-1.9.22 @@ -52,11 +53,10 @@ Requires: xml-commons-apis # Explicit requires for javapackages-tools since nekohtml-filter script # uses /usr/share/java-utils/java-functions Requires: javapackages-tools -BuildRequires: javapackages-local -BuildRequires: ant +BuildRequires: javapackages-local-openjdk25 +BuildRequires: ant-openjdk25 BuildRequires: ant-junit BuildRequires: xerces-j2 -BuildRequires: xerces-j2-javadoc BuildRequires: xml-commons-apis BuildArch: noarch @@ -90,9 +90,9 @@ Demonstrations and samples for %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 find -name "*.jar" -delete sed -i 's/\r$//g' *.txt doc/*.html @@ -141,6 +141,39 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* Wed Jul 30 2025 jiri vanek - 0:1.9.22-32 +- Rrevert to jdk21 + +* Tue Jul 29 2025 jiri vanek - 0:1.9.22-31 +- Rebuilt for java-25-openjdk as preffered jdk + +* Thu Jul 24 2025 Fedora Release Engineering - 0:1.9.22-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 0:1.9.22-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 24 2024 Miroslav Suchý - 0:1.9.22-28 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 0:1.9.22-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 0:1.9.22-26 +- Rebuilt for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 0:1.9.22-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0:1.9.22-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0:1.9.22-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0:1.9.22-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 0:1.9.22-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild