From f906e28544d954d4eee39c7572f6da1e90830f03 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 16:20:00 +0200 Subject: [PATCH 01/15] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- nekohtml.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 9c93924..7fe606b 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -60,6 +60,7 @@ BuildRequires: xerces-j2-javadoc BuildRequires: xml-commons-apis BuildArch: noarch +ExclusiveArch: %{java_arches} noarch %description NekoHTML is a simple HTML scanner and tag balancer that enables @@ -140,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* Fri Jul 08 2022 Jiri Vanek - 0:1.9.22-20 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 0:1.9.22-19 - Rebuilt for java-17-openjdk as system jdk From 5135b309c10fffcf66ecb27c27dc813f30e16685 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:21:06 +0000 Subject: [PATCH 02/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 7fe606b..189d9c0 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0:1.9.22-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 0:1.9.22-20 - Rebuilt for Drop i686 JDKs From 98a488de4dc2e310a1476b58b8567d0e86924c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:21:51 +0000 Subject: [PATCH 03/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 189d9c0..64bc703 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From efec353b9d3932ea518d92591454c3ca7a63b668 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:26:05 +0000 Subject: [PATCH 04/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 64bc703..2aea33f 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 4924f4b07df0711f90c8f952fab0d767ff70ab39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:24:55 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 2aea33f..9e2a48c 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 5ec25baaa1c9e935e0e0f62325d72e7589c38b44 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:44:51 +0000 Subject: [PATCH 06/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 9e2a48c..9ea9dc4 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 88248f36600165ba4fa8f422f3d056f11348c296 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:28:53 +0100 Subject: [PATCH 07/15] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 9ea9dc4..e779c18 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 25%{?dist} +Release: 26%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 6415340f5b3a15ad3e3e5e25309831dfb6523ce6 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:48 +0200 Subject: [PATCH 08/15] Eliminate use of obsolete %patchN syntax (#2283636) --- nekohtml.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index e779c18..c1eaba3 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -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 From bd5822d619dc8e1b3b4a1571c78e5b9f51c06ea0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:17:17 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index c1eaba3..277df3d 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 26%{?dist} +Release: 27%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 3547ded8986245d669fe40614ca6e8447d20cc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 16:43:48 +0200 Subject: [PATCH 10/15] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- nekohtml.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index 277df3d..e226432 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,10 +30,11 @@ Name: nekohtml Version: 1.9.22 -Release: 27%{?dist} +Release: 28%{?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 @@ -141,6 +142,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 3a9bf99b63455b4e2c7c943d764e76312421e170 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:51:08 +0000 Subject: [PATCH 11/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index e226432..8ef73e2 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 28%{?dist} +Release: 29%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -142,6 +142,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From a4cc38356c1d13ca0a794dddf03fc4a4d2abf6d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:42:13 +0000 Subject: [PATCH 12/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 8ef73e2..2ac7fde 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 29%{?dist} +Release: 30%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -142,6 +142,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 4149f6a6f51915edef7f0f5523777509650f9d6d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:48:55 +0200 Subject: [PATCH 13/15] 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. --- nekohtml.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index 2ac7fde..0711899 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 30%{?dist} +Release: 31%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -53,8 +53,8 @@ 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 @@ -142,6 +142,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From ee8be089427d56f3d124b0a41a74b0618cec5c32 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 14:09:16 +0200 Subject: [PATCH 14/15] Rrevert to jdk21 during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk your package failed to build. Is preemptively reverted back to versioned jdk21 --- nekohtml.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index 0711899..ec721e4 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 31%{?dist} +Release: 32%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -53,8 +53,8 @@ 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-openjdk25 -BuildRequires: ant-openjdk25 +BuildRequires: javapackages-local-openjdk21 +BuildRequires: ant-openjdk21 BuildRequires: ant-junit BuildRequires: xerces-j2 BuildRequires: xerces-j2-javadoc @@ -142,6 +142,9 @@ 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 From 5dcdbf72b760e1d379b0607517e2ad538626a012 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 6 Jan 2026 14:53:26 +0100 Subject: [PATCH 15/15] Bumped to jdk25 --- nekohtml.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index ec721e4..534b50a 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 32%{?dist} +Release: 33%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -53,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-openjdk21 -BuildRequires: ant-openjdk21 +BuildRequires: javapackages-local-openjdk25 +BuildRequires: ant-openjdk25 BuildRequires: ant-junit BuildRequires: xerces-j2 -BuildRequires: xerces-j2-javadoc BuildRequires: xml-commons-apis BuildArch: noarch