From 3c9b3b041ffce60176b3a8bf1ab0feead74d84f7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 Dec 2025 14:06:09 +0900 Subject: [PATCH 1/4] Handle minitest 6 compatibility --- rubygem-nokogiri-1.18.10-minitest6.patch | 11 +++++++++++ rubygem-nokogiri.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rubygem-nokogiri-1.18.10-minitest6.patch diff --git a/rubygem-nokogiri-1.18.10-minitest6.patch b/rubygem-nokogiri-1.18.10-minitest6.patch new file mode 100644 index 0000000..f2e2b8f --- /dev/null +++ b/rubygem-nokogiri-1.18.10-minitest6.patch @@ -0,0 +1,11 @@ +diff -urp '--exclude=*~' nokogiri-1.18.10.orig/test/helper.rb nokogiri-1.18.10/test/helper.rb +--- nokogiri-1.18.10.orig/test/helper.rb 2025-12-24 12:29:06.569389292 +0900 ++++ nokogiri-1.18.10/test/helper.rb 2025-12-24 12:39:48.443826371 +0900 +@@ -41,6 +41,7 @@ warn + + require "minitest/autorun" + require "minitest/benchmark" ++require "minitest/mock" + + if !Nokogiri.jruby? && ENV["NCPU"].to_i > 1 + require "minitest/parallel_fork" diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 700765b..737f6a1 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.10 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -29,6 +29,8 @@ Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz Source2: nokogiri-create-full-tarball.sh # Shut down libxml2 version unmatching warning Patch0: %{name}-1.11.0.rc4-shutdown-libxml2-warning.patch +# Handle minitest 6 +Patch1: %{name}-1.18.10-minitest6.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -37,6 +39,7 @@ BuildRequires: rubygem(minitest) %if !0%{?rhel} # For test/xml/test_document_encoding.rb # Drop rubygem(rubyzip) build dependency in RHEL +BuildRequires: rubygem(minitest-mock) BuildRequires: rubygem(rubyzip) %endif BuildRequires: rubygems-devel @@ -84,6 +87,7 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 +%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -275,6 +279,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Dec 24 2025 Mamoru TASAKA - 1.18.10-2 +- Handle minitest 6 compatibility + * Mon Sep 15 2025 Mamoru TASAKA - 1.18.10-1 - 1.18.10 From 52f0942f45c0d1865345d94499bf785278a3950b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 30 Dec 2025 10:24:29 +0900 Subject: [PATCH 2/4] 1.19.0 --- rubygem-nokogiri.spec | 10 +++++----- sources | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 737f6a1..3dd5198 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.18.10 +%global mainver 1.19.0 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -29,8 +29,6 @@ Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz Source2: nokogiri-create-full-tarball.sh # Shut down libxml2 version unmatching warning Patch0: %{name}-1.11.0.rc4-shutdown-libxml2-warning.patch -# Handle minitest 6 -Patch1: %{name}-1.18.10-minitest6.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -87,7 +85,6 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 -%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -279,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Dec 30 2025 Mamoru TASAKA - 1.19.0-1 +- 1.19.0 + * Wed Dec 24 2025 Mamoru TASAKA - 1.18.10-2 - Handle minitest 6 compatibility diff --git a/sources b/sources index 2c3b067..52222fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.10.gem) = 82d7cefeedb3328cc427ce6eb6394ef07d18c6b5a4d495e3f3c0270320dcd64904b1229e427780fda48b8877bfae5043df000fd850bb303ed09735d3ba63f974 -SHA512 (rubygem-nokogiri-1.18.10-full.tar.gz) = a230b8da7ad7eb01f496a87b89c0e78799cccc7726e7d8ee8ee09841c82d819bf269700f98effce69ff2b8d2926de085cfda8e350c7d77a463ea25d875f12cf8 +SHA512 (rubygem-nokogiri-1.19.0-full.tar.gz) = 29dd894b176857d55eb5e670f50e69762e74c0a13e6949030af17e3c84b65f9dfe0087210b84a7c77749d3d1a4a33292d62f7005003745e8f087d822ee64f4b1 +SHA512 (nokogiri-1.19.0.gem) = d9326a2e60b6ea3152c5f9d53df738610f18ca57cffcd3bf2f8b07a2b08b30085d0fce2ca8206279ad6a0f1a613e9e76821c09aef45cf5e5b2d00ff766734872 From f276b8890f6f100a3ae3102836dfb0d0f3650daf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 10:50:05 +0900 Subject: [PATCH 3/4] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 3dd5198..25eeff8 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.19.0 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -276,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 1.19.0-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Tue Dec 30 2025 Mamoru TASAKA - 1.19.0-1 - 1.19.0 From f64183f18aa0570107595cd0173d9c1748aa19de Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 12 Jan 2026 19:06:43 -0500 Subject: [PATCH 4/4] Fix tests in ELN minitest-mock was split out of minitest 6 (F44+). While only needed for a few tests, the module is imported at the test helper level. --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 25eeff8..b28fa64 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -34,10 +34,10 @@ BuildRequires: ruby(rubygems) ## ## For %%check BuildRequires: rubygem(minitest) +BuildRequires: rubygem(minitest-mock) %if !0%{?rhel} # For test/xml/test_document_encoding.rb # Drop rubygem(rubyzip) build dependency in RHEL -BuildRequires: rubygem(minitest-mock) BuildRequires: rubygem(rubyzip) %endif BuildRequires: rubygems-devel