From 6b58fbd99c3170fd87103b2a8da215d8004c4269 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 16 Aug 2018 18:21:55 +0200 Subject: [PATCH 001/103] Fix bogus date warnings when "fedpkg srpm". --- rubygem-nokogiri.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index bb5d74d..0afcb24 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -376,7 +376,7 @@ popd - F-17: rebuild for ruby19 - For now aviod build failure by touching some files -* Thu Jan 18 2012 Mamoru Tasaka - 1.5.0-1 +* Wed Jan 18 2012 Mamoru Tasaka - 1.5.0-1 - 1.5.0 * Sat Jan 14 2012 Fedora Release Engineering - 1.5.0-0.5.beta4.1 @@ -385,7 +385,7 @@ popd * Sun Jun 26 2011 Mamoru Tasaka - 1.5.0-0.5.beta4 - Remove unneeded patch -* Thu Mar 18 2011 Mamoru Tasaka - 1.5.0-0.4.beta4 +* Fri Mar 18 2011 Mamoru Tasaka - 1.5.0-0.4.beta4 - Patch for newer rake to make testsuite run * Wed Feb 09 2011 Fedora Release Engineering - 1.5.0-0.3.beta4.1 From ab7057d9386c39054e6cecbdf3cae539a5ae7331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 22 Oct 2020 11:34:57 +0200 Subject: [PATCH 002/103] Drop unnecessary rubygem(pkg-config) dependency. This dependency was never really needed to build Nokogiri for Fedora. Moreover, the explicit dependency was dropped due to license concerns. https://github.com/sparklemotion/nokogiri/commit/aa154fca45df69eef2dd61ba9bc7660b72f63e17 --- rubygem-nokogiri.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 220f4eb..db0a6db 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.10.10 #%%global prever .rc3 -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -35,7 +35,6 @@ Obsoletes: ruby-%{gem_name} <= 1.5.2-2 ## ## Others BuildRequires: gcc -BuildRequires: rubygem(pkg-config) BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: ruby-devel @@ -230,6 +229,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Oct 22 2020 Vít Ondruch - 1.10.10-2 +- Drop unnecessary rubygem(pkg-config) dependency. + * Sat Aug 8 2020 Mamoru TASAKA - 1.10.10-1 - 1.10.10 From 0708c9bfc0baad2696bbd9c85235b0fdd3d11ccb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 31 Dec 2020 18:03:49 +0900 Subject: [PATCH 003/103] 1.11.0.rc4 --- .gitignore | 2 ++ ...-1.11.0.rc4-shutdown-libxml2-warning.patch | 10 ++++++++++ ...iri-1.6.6.4-shutdown-libxml2-warning.patch | 10 ---------- rubygem-nokogiri.spec | 20 ++++++++++++------- sources | 4 ++-- 5 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch delete mode 100644 rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch diff --git a/.gitignore b/.gitignore index 7de418a..1e6109a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.10.9-full.tar.gz /nokogiri-1.10.10.gem /rubygem-nokogiri-1.10.10-full.tar.gz +/nokogiri-1.11.0.rc4.gem +/rubygem-nokogiri-1.11.0.rc4-full.tar.gz diff --git a/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch b/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch new file mode 100644 index 0000000..c1ed61c --- /dev/null +++ b/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch @@ -0,0 +1,10 @@ +--- nokogiri-1.11.0.rc4/lib/nokogiri/version/info.rb.warn 2020-12-31 16:56:11.533949657 +0900 ++++ nokogiri-1.11.0.rc4/lib/nokogiri/version/info.rb 2020-12-31 16:59:38.576697147 +0900 +@@ -58,6 +58,7 @@ module Nokogiri + + def warnings + warnings = [] ++ return warnings + + if libxml2? + if compiled_libxml_version != loaded_libxml_version diff --git a/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch b/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch deleted file mode 100644 index add8fe8..0000000 --- a/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nokogiri-1.6.6.4/./lib/nokogiri/version.rb.nowarn 2015-11-20 05:50:37.000000000 +0900 -+++ nokogiri-1.6.6.4/./lib/nokogiri/version.rb 2015-12-11 14:32:04.151973080 +0900 -@@ -34,6 +34,7 @@ - end - - def warnings -+ return [] - return [] unless libxml2? - - if compiled_parser_version != loaded_parser_version diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index db0a6db..d43beec 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.10.10 -#%%global prever .rc3 +%global mainver 1.11.0 +%global prever .rc4 -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -17,18 +17,19 @@ License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem # %%{SOURCE2} %%{name} %%{version} -Source1: rubygem-%{gem_name}-%{version}-full.tar.gz +Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz Source2: nokogiri-create-full-tarball.sh # ./test/html/test_element_description.rb:62 fails, as usual...... # Patch0: rubygem-nokogiri-1.5.0.beta3-test-failure.patch #Patch0: rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch # Shut down libxml2 version unmatching warning -Patch0: %{name}-1.6.6.4-shutdown-libxml2-warning.patch +Patch0: %{name}-1.11.0.rc4-shutdown-libxml2-warning.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## ## For %%check BuildRequires: rubygem(minitest) +BuildRequires: rubygem(minitest-reporters) BuildRequires: rubygems-devel Obsoletes: ruby-%{gem_name} <= 1.5.2-2 #BuildRequires: ruby(racc) @@ -159,6 +160,7 @@ cp -p %{gem_name}-%{version}/[A-Z]* %{buildroot}%{gem_instdir}/ rm -rf %{buildroot}%{gem_instdir}/ext/%{gem_name}/ rm -rf %{buildroot}%{gem_instdir}/tmp/ rm -f %{buildroot}%{gem_instdir}/{.autotest,.require_paths,.gemtest,.travis.yml} +rm -f %{buildroot}%{gem_instdir}/.vagant rm -f %{buildroot}%{gem_instdir}/appveyor.yml rm -f %{buildroot}%{gem_instdir}/.cross_rubies rm -f %{buildroot}%{gem_instdir}/{build_all,dependencies.yml,test_all} @@ -187,8 +189,9 @@ sed -i test/helper.rb \ -e '\@require.*simplecov@,\@^end$@d' # Need investigation. For now anyway build -ruby \ - -I.:lib:test:ext \ +env \ + RUBYLIB=".:lib:test:ext" \ + ruby \ -e \ "require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \ exit 1 @@ -229,6 +232,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Dec 31 2020 Mamoru TASAKA - 1.11.0-0.1.rc4 +- 1.11.0.rc4 + * Thu Oct 22 2020 Vít Ondruch - 1.10.10-2 - Drop unnecessary rubygem(pkg-config) dependency. diff --git a/sources b/sources index 64bf752..55f39ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.10.10.gem) = b4628df47dbd8b9123a6f0625829e745a19d26539d54b2748c985d6fdda978072bdcd136df2f47535984186eae7fb318b67d59f1ea413777f1a146bc78e0dae2 -SHA512 (rubygem-nokogiri-1.10.10-full.tar.gz) = 441bcb80afd9ea6eb0722c48b6df50e01f4977c7392b2c24bba0f9ea8a0755e63c6c28023730c960783b6c8a408b082ae8dd9982632131edd438fa7389a7b4f6 +SHA512 (nokogiri-1.11.0.rc4.gem) = fc5c7100632d2137cfcfad27e0bff67babc238252e6260c6aa8ae6a509ac8fb13bce43567552487390d13d5cb138ffc8a8b3935063512d03e7dfb202090beda6 +SHA512 (rubygem-nokogiri-1.11.0.rc4-full.tar.gz) = 3fd86214c757715600406a8a296f97876740b4492ff698a380d7895544aca6d3f2735f19a24ba2ac90af1429027ade91a989ff432b24aba5626b87caddd9ab46 From f5afcf0d50be695f27eb67f67d588e8084760073 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Jan 2021 17:08:55 +0900 Subject: [PATCH 004/103] 1.11.0 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1e6109a..3a75fb4 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.10.10-full.tar.gz /nokogiri-1.11.0.rc4.gem /rubygem-nokogiri-1.11.0.rc4-full.tar.gz +/rubygem-nokogiri-1.11.0-full.tar.gz +/nokogiri-1.11.0.gem diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index d43beec..50d73bd 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,5 +1,5 @@ %global mainver 1.11.0 -%global prever .rc4 +#%%global prever .rc4 %global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') @@ -232,6 +232,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jan 6 2021 Mamoru TASAKA - 1.11.0-1 +- 1.11.0 + * Thu Dec 31 2020 Mamoru TASAKA - 1.11.0-0.1.rc4 - 1.11.0.rc4 diff --git a/sources b/sources index 55f39ca..299934a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.11.0.rc4.gem) = fc5c7100632d2137cfcfad27e0bff67babc238252e6260c6aa8ae6a509ac8fb13bce43567552487390d13d5cb138ffc8a8b3935063512d03e7dfb202090beda6 -SHA512 (rubygem-nokogiri-1.11.0.rc4-full.tar.gz) = 3fd86214c757715600406a8a296f97876740b4492ff698a380d7895544aca6d3f2735f19a24ba2ac90af1429027ade91a989ff432b24aba5626b87caddd9ab46 +SHA512 (rubygem-nokogiri-1.11.0-full.tar.gz) = c0198d7d1b7977c4c45a354c2880e488a5833757e43fc2728cab23dd0eb464b18d92e38f312b942523e62119e3fae0edc77719b6ea86d20bc01b8481a2909954 +SHA512 (nokogiri-1.11.0.gem) = bc02f3d845d5615f481d9e507f5c37ff8e05ab0e8e1dca2846c341c8b1de47e000183ead0207019fa2dbd8904dd1fa4b562ecd3ce1bc4f6dc6d537373057afeb From e8f55bb1e44927582d1daee85c71adcf39cecbb4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Jan 2021 19:45:17 +0900 Subject: [PATCH 005/103] F-34: rebuild against ruby 3.0 --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 50d73bd..61ada1b 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem @@ -232,6 +232,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jan 06 2021 Mamoru TASAKA - 1.11.0-1.1 +- F-34: rebuild against ruby 3.0 + * Wed Jan 6 2021 Mamoru TASAKA - 1.11.0-1 - 1.11.0 From 597b7af761407c6267764490e81acf5fbb2a3fd1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 8 Jan 2021 14:36:10 +0900 Subject: [PATCH 006/103] 1.11.1 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3a75fb4..5ebd9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.11.0.rc4-full.tar.gz /rubygem-nokogiri-1.11.0-full.tar.gz /nokogiri-1.11.0.gem +/rubygem-nokogiri-1.11.1-full.tar.gz +/nokogiri-1.11.1.gem diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 61ada1b..98019d0 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.11.0 +%global mainver 1.11.1 #%%global prever .rc4 %global mainrel 1 @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem @@ -232,6 +232,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jan 8 2021 Mamoru TASAKA - 1.11.1-1 +- 1.11.1 + * Wed Jan 06 2021 Mamoru TASAKA - 1.11.0-1.1 - F-34: rebuild against ruby 3.0 diff --git a/sources b/sources index 299934a..5ca9928 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-nokogiri-1.11.0-full.tar.gz) = c0198d7d1b7977c4c45a354c2880e488a5833757e43fc2728cab23dd0eb464b18d92e38f312b942523e62119e3fae0edc77719b6ea86d20bc01b8481a2909954 -SHA512 (nokogiri-1.11.0.gem) = bc02f3d845d5615f481d9e507f5c37ff8e05ab0e8e1dca2846c341c8b1de47e000183ead0207019fa2dbd8904dd1fa4b562ecd3ce1bc4f6dc6d537373057afeb +SHA512 (rubygem-nokogiri-1.11.1-full.tar.gz) = 51ed6c8b52474c38bf1bd29aaec6a663daa7f238db2e4a29d01df00eef46f7980b31c3beff74106a3dc6133906e24e8c2153c333eb5ea4ef2508c4005f26d337 +SHA512 (nokogiri-1.11.1.gem) = 6d73cde64190afd0850eca9bedb41ceccd34919f04bd83726ba41cf1bda1bab3ecd56a5c4d391f1eb9f7e407a80ec65c922a2ebf8c7854ffc8a08bbd284f6827 From 0960da30eebf942a8c8a219d613141d33afe733a Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 21 Jan 2021 09:10:18 -0800 Subject: [PATCH 007/103] mini bump for eln rebuild --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 98019d0..30a7dce 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}.1%{?dist} License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem From 3525b7770206b554fbd9b6c15e44e785e3b22c5a Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 21 Jan 2021 09:37:12 -0800 Subject: [PATCH 008/103] undo mini bump --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 30a7dce..98019d0 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}.1%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem From ef16442aeccbbcecfd541584fedaff639b9a2293 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 23 Jan 2021 15:31:24 +0900 Subject: [PATCH 009/103] indentation --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 27da584..f2b9d9b 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -144,7 +144,7 @@ popd # move bin/ files mkdir -p %{buildroot}%{_bindir} cp -pa .%{_bindir}/* \ - %{buildroot}%{_bindir}/ + %{buildroot}%{_bindir}/ # remove all shebang for f in $(find %{buildroot}%{gem_instdir} -name \*.rb) From b3185d3313325dc5c4b4da1c347552a23238536d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 16:13:59 +0000 Subject: [PATCH 010/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index f2b9d9b..6e4ee78 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem @@ -232,6 +232,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.11.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 8 2021 Mamoru TASAKA - 1.11.1-1 - 1.11.1 From a74dc41ad0a91c9c920b793d39258aa350d177d8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Mar 2021 16:01:37 +0900 Subject: [PATCH 011/103] 1.11.2 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5ebd9c8..b3e778f 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ nokogiri-1.4.3.1.gem /nokogiri-1.11.0.gem /rubygem-nokogiri-1.11.1-full.tar.gz /nokogiri-1.11.1.gem +/nokogiri-1.11.2.gem +/rubygem-nokogiri-1.11.2-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 6e4ee78..e74fda5 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.11.1 +%global mainver 1.11.2 #%%global prever .rc4 %global mainrel 1 @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem @@ -232,6 +232,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Mar 12 2021 Mamoru TASAKA - 1.11.2-1 +- 1.11.2 + * Wed Jan 27 2021 Fedora Release Engineering - 1.11.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 5ca9928..e57faca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-nokogiri-1.11.1-full.tar.gz) = 51ed6c8b52474c38bf1bd29aaec6a663daa7f238db2e4a29d01df00eef46f7980b31c3beff74106a3dc6133906e24e8c2153c333eb5ea4ef2508c4005f26d337 -SHA512 (nokogiri-1.11.1.gem) = 6d73cde64190afd0850eca9bedb41ceccd34919f04bd83726ba41cf1bda1bab3ecd56a5c4d391f1eb9f7e407a80ec65c922a2ebf8c7854ffc8a08bbd284f6827 +SHA512 (nokogiri-1.11.2.gem) = de2d461b6c6d852c1d414d97c579b33cecc1d79b8cf87652c1ac5a2fa8487c477f61b66e35fe6f99e0483bce7ebec5cab681191b320b057d4c09de3b226a2609 +SHA512 (rubygem-nokogiri-1.11.2-full.tar.gz) = fec12b59581d8f5f5e364ef72c958625aacee57f030b1ea9045341be14adeb78e5a6aecd5026a438a4bf0af61724eb49fdf0e39f22c0719bb50bb75540de5ef3 From bb05efa7e61c03f8530391269afc633aed3b8cad Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Apr 2021 10:03:56 +0900 Subject: [PATCH 012/103] 1.11.3 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 66 +++++++++++++------------------------------ sources | 4 +-- 3 files changed, 24 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index b3e778f..5e8f1f7 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,5 @@ nokogiri-1.4.3.1.gem /nokogiri-1.11.1.gem /nokogiri-1.11.2.gem /rubygem-nokogiri-1.11.2-full.tar.gz +/nokogiri-1.11.3.gem +/rubygem-nokogiri-1.11.3-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index e74fda5..e56b8b3 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.11.2 +%global mainver 1.11.3 #%%global prever .rc4 %global mainrel 1 @@ -78,44 +78,29 @@ This package provides non-Gem support for %{gem_name}. %global version %{mainver}%{?prever} %prep -%setup -q -T -c -a 1 - -# Gem repack -TOPDIR=$(pwd) -mkdir tmpunpackdir -pushd tmpunpackdir - -gem unpack %{SOURCE0} -cd %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} -a 1 +mv ../%{gem_name}-%{version}.gemspec . # patches %patch0 -p1 -gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec - # remove bundled external libraries sed -i \ -e 's|, "ports/archives/[^"][^"]*"||g' \ -e 's|, "ports/patches/[^"][^"]*"||g' \ - %{gem_name}.gemspec + %{gem_name}-%{version}.gemspec # Actually not needed when using system libraries -sed -i -e '\@mini_portile@d' %{gem_name}.gemspec +sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec # Ummm... -LANG=C.UTF-8 gem build %{gem_name}.gemspec -mv %{gem_name}-%{version}.gem $TOPDIR - -popd -rm -rf tmpunpackdir +LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec %build -mkdir -p ./%{gem_dir} # 1.6.0 needs this export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes %gem_install - # Permission chmod 0644 .%{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}.gem @@ -157,20 +142,17 @@ done cp -p %{gem_name}-%{version}/[A-Z]* %{buildroot}%{gem_instdir}/ # cleanups -rm -rf %{buildroot}%{gem_instdir}/ext/%{gem_name}/ -rm -rf %{buildroot}%{gem_instdir}/tmp/ -rm -f %{buildroot}%{gem_instdir}/{.autotest,.require_paths,.gemtest,.travis.yml} -rm -f %{buildroot}%{gem_instdir}/.vagant -rm -f %{buildroot}%{gem_instdir}/appveyor.yml -rm -f %{buildroot}%{gem_instdir}/.cross_rubies -rm -f %{buildroot}%{gem_instdir}/{build_all,dependencies.yml,test_all} -rm -f %{buildroot}%{gem_instdir}/.editorconfig -rm -rf %{buildroot}%{gem_instdir}/suppressions/ -rm -rf %{buildroot}%{gem_instdir}/patches/ -rm -f %{buildroot}%{gem_instdir}/{Rakefile,Gemfile*} -rm -f %{buildroot}%{gem_instdir}/Manifest.txt - - +pushd %{buildroot}%{gem_instdir} +rm -rf \ + Gemfile* \ + dependencies.yml \ + ext \ + *gemspec \ + patches \ + ports \ + %{nil} +popd +rm -f %{buildroot}%{gem_cache} %check # Ah.... @@ -214,24 +196,16 @@ popd %{gem_instdir}/bin/ %{gem_instdir}/lib/ -%exclude %{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}.gem %{gem_dir}/specifications/%{gem_name}-%{mainver}%{?prever}.gemspec -%if 0 -%files jruby -%defattr(-,root,root,-) -%{gem_instdir}/ext/java/ -%endif - %files doc %defattr(-,root,root,-) -#%%{gem_instdir}/deps.rip -#%%{gem_instdir}/spec/ -%exclude %{gem_instdir}/tasks/ -%exclude %{gem_instdir}/test/ %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Apr 8 2021 Mamoru TASAKA - 1.11.3-1 +- 1.11.3 + * Fri Mar 12 2021 Mamoru TASAKA - 1.11.2-1 - 1.11.2 diff --git a/sources b/sources index e57faca..8c5fcd3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.11.2.gem) = de2d461b6c6d852c1d414d97c579b33cecc1d79b8cf87652c1ac5a2fa8487c477f61b66e35fe6f99e0483bce7ebec5cab681191b320b057d4c09de3b226a2609 -SHA512 (rubygem-nokogiri-1.11.2-full.tar.gz) = fec12b59581d8f5f5e364ef72c958625aacee57f030b1ea9045341be14adeb78e5a6aecd5026a438a4bf0af61724eb49fdf0e39f22c0719bb50bb75540de5ef3 +SHA512 (nokogiri-1.11.3.gem) = e11789a27ecbba6bd49eaa9180eafa782d3de6453e993f86079e45e8c1cc8014d1ae6d47fb5237d619a5b84870b94ef383ef117c78fcc8035922534b53c92524 +SHA512 (rubygem-nokogiri-1.11.3-full.tar.gz) = 7fe528f65685c66058dbd3979bc1e33f08261c8ce9bad8ffee9f327161551769895bb65a23eb7d2ef467b80b5cda1453840c670b0a476294534daf37d5a46aa5 From 2ceaea6a75f29b2d5c13c8c2bc4ed031dd598d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 7 May 2021 14:29:57 +0200 Subject: [PATCH 013/103] Remove rubygem(minitest-reporters) dependency. This does not provide any value for Fedora, but it bloats dependency chain. Less dependencies is also advantage for ELN. --- rubygem-nokogiri.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index e56b8b3..e06d835 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.11.3 #%%global prever .rc4 -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -29,7 +29,6 @@ BuildRequires: ruby(rubygems) ## ## For %%check BuildRequires: rubygem(minitest) -BuildRequires: rubygem(minitest-reporters) BuildRequires: rubygems-devel Obsoletes: ruby-%{gem_name} <= 1.5.2-2 #BuildRequires: ruby(racc) @@ -170,6 +169,11 @@ pushd ./%{gem_instdir} sed -i test/helper.rb \ -e '\@require.*simplecov@,\@^end$@d' +# Remove minitest-reporters. It does not provide any additional value while +# it blows up the dependency chain. +sed -i '/require..minitest.reporters./ s/^/#/' test/helper.rb +sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb + # Need investigation. For now anyway build env \ RUBYLIB=".:lib:test:ext" \ @@ -203,6 +207,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri May 07 2021 Vít Ondruch - 1.11.3-2 +- Remove rubygem(minitest-reporters) dependency. + * Thu Apr 8 2021 Mamoru TASAKA - 1.11.3-1 - 1.11.3 From ff224af82a7ab0537ca012d065417bc9b7e8f26c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 16 May 2021 21:35:58 +0900 Subject: [PATCH 014/103] 1.11.4 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 21 ++++++++++++++++++--- sources | 4 ++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5e8f1f7..f63d22d 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.11.2-full.tar.gz /nokogiri-1.11.3.gem /rubygem-nokogiri-1.11.3-full.tar.gz +/nokogiri-1.11.4.gem +/rubygem-nokogiri-1.11.4-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index e06d835..66dce6d 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.11.3 +%global mainver 1.11.4 #%%global prever .rc4 -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -37,6 +37,8 @@ Obsoletes: ruby-%{gem_name} <= 1.5.2-2 BuildRequires: gcc BuildRequires: libxml2-devel BuildRequires: libxslt-devel +# Explicit write this for checking libxml2 version +BuildRequires: %{_bindir}/pkg-config BuildRequires: ruby-devel # ruby27 needs this explicitly BuildRequires: rubygem(racc) @@ -83,6 +85,16 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch0 -p1 +# https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/82 +# https://github.com/sparklemotion/nokogiri/blob/7df5d3cabfaa7f3617ed656e2dc47ba4291cbc3a/test/html/test_comments.rb#L132 +if pkg-config --atleast-version=2.9.12 libxml-2.0 +then + sed -i %{gem_name}-%{version}/test/html/test_comments.rb \ + -e 's@Nokogiri::VersionInfo.instance.libxml2_using_packaged.@ ( Nokogiri::VersionInfo.instance.libxml2_using_packaged? || Nokogiri::VersionInfo.instance.libxml2_using_system? ) @' \ + -e '\@Nokogiri.jruby@s@ || Nokogiri::VersionInfo.instance.libxml2_using_system.@@'\ + %{nil} +fi + # remove bundled external libraries sed -i \ -e 's|, "ports/archives/[^"][^"]*"||g' \ @@ -92,7 +104,7 @@ sed -i \ sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec # Ummm... -LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec +env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec %build # 1.6.0 needs this @@ -207,6 +219,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun May 16 2021 Mamoru TASAKA - 1.11.4-1 +- 1.11.4 + * Fri May 07 2021 Vít Ondruch - 1.11.3-2 - Remove rubygem(minitest-reporters) dependency. diff --git a/sources b/sources index 8c5fcd3..7fce4c6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.11.3.gem) = e11789a27ecbba6bd49eaa9180eafa782d3de6453e993f86079e45e8c1cc8014d1ae6d47fb5237d619a5b84870b94ef383ef117c78fcc8035922534b53c92524 -SHA512 (rubygem-nokogiri-1.11.3-full.tar.gz) = 7fe528f65685c66058dbd3979bc1e33f08261c8ce9bad8ffee9f327161551769895bb65a23eb7d2ef467b80b5cda1453840c670b0a476294534daf37d5a46aa5 +SHA512 (nokogiri-1.11.4.gem) = 5e097027afe2394de60c08294bac5d5bb81f8a930fcc88dcf8d9b732d4d3336154c1b06ce07ca5c5f405a9ddd5413e092ac3a2a9ef9f432daea00cba9b7c2b07 +SHA512 (rubygem-nokogiri-1.11.4-full.tar.gz) = 79064637fbc28d68e0fbb38d64346ca7a6e28b53e6a4f0e896591a62c4487d0016f1a9f6cbfa254c6f3838691a87c316dfc4f20370dddf135e7badc21a106163 From 4e1976f80856a64164d3e7a56353072e524cace2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 10 Jun 2021 13:34:41 +0200 Subject: [PATCH 015/103] Update upstream URL. RubyForge is dead for a long time already. This follows the latest gem metadata: https://github.com/sparklemotion/nokogiri/commit/06c0ca258713a4a2903a64d6636afe8b443d63ab --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 66dce6d..556dbb6 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -14,7 +14,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} License: MIT -URL: http://nokogiri.rubyforge.org/nokogiri/ +URL: https://nokogiri.org Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz From 0586003418e6e0f5026e1f89a514f64ad57ce7a1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 19 Jun 2021 09:42:24 +0900 Subject: [PATCH 016/103] 1.11.7 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 18 ++++-------------- sources | 4 ++-- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index f63d22d..cddfe55 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.11.3-full.tar.gz /nokogiri-1.11.4.gem /rubygem-nokogiri-1.11.4-full.tar.gz +/nokogiri-1.11.7.gem +/rubygem-nokogiri-1.11.7-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 556dbb6..4a3b320 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.11.4 +%global mainver 1.11.7 #%%global prever .rc4 %global mainrel 1 @@ -37,8 +37,6 @@ Obsoletes: ruby-%{gem_name} <= 1.5.2-2 BuildRequires: gcc BuildRequires: libxml2-devel BuildRequires: libxslt-devel -# Explicit write this for checking libxml2 version -BuildRequires: %{_bindir}/pkg-config BuildRequires: ruby-devel # ruby27 needs this explicitly BuildRequires: rubygem(racc) @@ -85,16 +83,6 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch0 -p1 -# https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/82 -# https://github.com/sparklemotion/nokogiri/blob/7df5d3cabfaa7f3617ed656e2dc47ba4291cbc3a/test/html/test_comments.rb#L132 -if pkg-config --atleast-version=2.9.12 libxml-2.0 -then - sed -i %{gem_name}-%{version}/test/html/test_comments.rb \ - -e 's@Nokogiri::VersionInfo.instance.libxml2_using_packaged.@ ( Nokogiri::VersionInfo.instance.libxml2_using_packaged? || Nokogiri::VersionInfo.instance.libxml2_using_system? ) @' \ - -e '\@Nokogiri.jruby@s@ || Nokogiri::VersionInfo.instance.libxml2_using_system.@@'\ - %{nil} -fi - # remove bundled external libraries sed -i \ -e 's|, "ports/archives/[^"][^"]*"||g' \ @@ -203,7 +191,6 @@ done popd %files -%defattr(-,root, root,-) %{_bindir}/%{gem_name} %{gem_extdir_mri}/ @@ -219,6 +206,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Jun 19 2021 Mamoru TASAKA - 1.11.7-1 +- 1.11.7 + * Sun May 16 2021 Mamoru TASAKA - 1.11.4-1 - 1.11.4 diff --git a/sources b/sources index 7fce4c6..4e7781e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.11.4.gem) = 5e097027afe2394de60c08294bac5d5bb81f8a930fcc88dcf8d9b732d4d3336154c1b06ce07ca5c5f405a9ddd5413e092ac3a2a9ef9f432daea00cba9b7c2b07 -SHA512 (rubygem-nokogiri-1.11.4-full.tar.gz) = 79064637fbc28d68e0fbb38d64346ca7a6e28b53e6a4f0e896591a62c4487d0016f1a9f6cbfa254c6f3838691a87c316dfc4f20370dddf135e7badc21a106163 +SHA512 (nokogiri-1.11.7.gem) = 9af016366aa9d7bcfa3e6aeaf9d45ab1893ccf7f87cc89e3bff4573f66af0773dbbbe2a955e0e111bd8159f99ea49cef72ae7641398b3015e9ccd918b6804b1a +SHA512 (rubygem-nokogiri-1.11.7-full.tar.gz) = 2d45181bbb760ace73accdf84def5f875040a2383d6b2b80f86d94edf2e0d03dce251b6accf611e66cda643037f80f178070194cc3ff553313b088caac647624 From 3f2614d2ae9856797ea5e57dc9d436186f7c4b61 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 19 Jun 2021 10:18:05 +0900 Subject: [PATCH 017/103] add BR: glibc-all-langpacks --- rubygem-nokogiri.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 4a3b320..ba83cac 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -33,6 +33,8 @@ BuildRequires: rubygems-devel Obsoletes: ruby-%{gem_name} <= 1.5.2-2 #BuildRequires: ruby(racc) ## +# test suite uses EUC-JP, SHIFT-JIS, etc +BuildRequires: glibc-all-langpacks ## Others BuildRequires: gcc BuildRequires: libxml2-devel From e689bc92389ca5ce20069e44bb36d3d92fffca13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 12:24:28 +0000 Subject: [PATCH 018/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index ba83cac..f1a9c38 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 License: MIT URL: https://nokogiri.org Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem @@ -208,6 +208,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.11.7-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jun 19 2021 Mamoru TASAKA - 1.11.7-1 - 1.11.7 From 4e193aeb64feeedee52fa2549cb59acbcb52f402 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 7 Aug 2021 16:05:43 +0900 Subject: [PATCH 019/103] First try to update to 1.12.1 - various modification for compiling gumbo --- rubygem-nokogiri.spec | 61 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index f1a9c38..829e6b2 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.11.7 +%global mainver 1.12.1 #%%global prever .rc4 -%global mainrel 1 +%global mainrel 0.101 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -12,8 +12,15 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 -License: MIT +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} + +# MIT: see LICENSE.md +# ASL 2.0 +# 1.12.0 bundles forked and modified gumbo - +# see gumbo-parser/src/attribute.c and ext/nokogiri/gumbo.c +# also lib/nokogiri/html5 is licensed under ASL 2.0 +License: MIT and ASL 2.0 + URL: https://nokogiri.org Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem # %%{SOURCE2} %%{name} %%{version} @@ -39,6 +46,8 @@ BuildRequires: glibc-all-langpacks BuildRequires: gcc BuildRequires: libxml2-devel BuildRequires: libxslt-devel +# From 1.12.0 need this to compile internal gumbo +BuildRequires: rubygem(mini_portile2) >= 2.6 BuildRequires: ruby-devel # ruby27 needs this explicitly BuildRequires: rubygem(racc) @@ -93,14 +102,38 @@ sed -i \ # Actually not needed when using system libraries sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec +# We install C extension module into different path +sed -i \ + lib/nokogiri/extension.rb \ + -e 's@require_relative "@require "nokogiri/@' + +# Don't clean up files used when building bundled gumbo, +# otherwise debuginfo rpm will become imcomplete +sed -i \ + ext/nokogiri/extconf.rb \ + -e '\@Pathname\.glob.*ports@s@ports@ports_ignore@' + +# Make gumbo build process verbose +sed -i \ + ext/nokogiri/extconf.rb \ + -e '\@execute.*compile.*make_cmd@s@env: env@env: env, debug: true@' + +# #line directive can confuse debuginfo, removing for now +sed -i \ + gumbo-parser/src/char_ref.c \ + -e '\@^#line [0-9]@s|^\(.*\)$|// \1|' + # Ummm... env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec %build # 1.6.0 needs this export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes +export V=1 +%set_build_flags %gem_install +find . -name compile.log | xargs cat # Permission chmod 0644 .%{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}.gem @@ -143,6 +176,7 @@ done cp -p %{gem_name}-%{version}/[A-Z]* %{buildroot}%{gem_instdir}/ # cleanups +# Remove bundled gumbo parser pushd %{buildroot}%{gem_instdir} rm -rf \ Gemfile* \ @@ -152,9 +186,19 @@ rm -rf \ patches \ ports \ %{nil} +pushd gumbo-parser +rm \ + Makefile \ + %{nil} +find src -type f | \ + grep -v README.md | \ + xargs rm -f + popd rm -f %{buildroot}%{gem_cache} +# Remove bundled gumbo parser + %check # Ah.... # test_exslt(TestXsltTransforms) [./test/test_xslt_transforms.rb:93] @@ -201,6 +245,12 @@ popd %{gem_instdir}/bin/ %{gem_instdir}/lib/ + +%dir %{gem_instdir}/gumbo-parser +%dir %{gem_instdir}/gumbo-parser/src +%doc %{gem_instdir}/gumbo-parser/[A-Z]* +%doc %{gem_instdir}/gumbo-parser/src/README.md + %{gem_dir}/specifications/%{gem_name}-%{mainver}%{?prever}.gemspec %files doc @@ -208,6 +258,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Aug 7 2021 Mamoru TASAKA - 1.12.1-1 +- 1.12.1 + * Fri Jul 23 2021 Fedora Release Engineering - 1.11.7-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4d4f491c08e44d7fe52b081d913451bc2a00fe61 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 7 Aug 2021 20:00:21 +0900 Subject: [PATCH 020/103] don't use mini_portile2, but build libgumbo.a by normal make --- rubygem-nokogiri.spec | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 829e6b2..08bb4bd 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -20,6 +20,7 @@ Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} # see gumbo-parser/src/attribute.c and ext/nokogiri/gumbo.c # also lib/nokogiri/html5 is licensed under ASL 2.0 License: MIT and ASL 2.0 +Provides: bundled(gumbo-parser) = 0.10.1 URL: https://nokogiri.org Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem @@ -46,8 +47,6 @@ BuildRequires: glibc-all-langpacks BuildRequires: gcc BuildRequires: libxml2-devel BuildRequires: libxslt-devel -# From 1.12.0 need this to compile internal gumbo -BuildRequires: rubygem(mini_portile2) >= 2.6 BuildRequires: ruby-devel # ruby27 needs this explicitly BuildRequires: rubygem(racc) @@ -107,33 +106,40 @@ sed -i \ lib/nokogiri/extension.rb \ -e 's@require_relative "@require "nokogiri/@' -# Don't clean up files used when building bundled gumbo, -# otherwise debuginfo rpm will become imcomplete +# Don't use mini_portile2, but build libgumbo.a first and +# tell extconf.rb the path to the archive sed -i \ ext/nokogiri/extconf.rb \ - -e '\@Pathname\.glob.*ports@s@ports@ports_ignore@' - -# Make gumbo build process verbose -sed -i \ - ext/nokogiri/extconf.rb \ - -e '\@execute.*compile.*make_cmd@s@env: env@env: env, debug: true@' + -e "s@^\(def process_recipe.*\)\$@\1 ; return true@" \ + -e "s@^\(append_cppflags\).*gumbo.*\$@\1(\"-I$(pwd)/gumbo-parser/src\")@" \ + -e "\@libs.*gumbo@s@File\.join.*@\"$(pwd)/gumbo-parser/src/libgumbo.a\"@" \ + -e "\@LIBPATH.*gumbo@s|^\(.*\)\$|# \1|" \ + %{nil} # #line directive can confuse debuginfo, removing for now sed -i \ gumbo-parser/src/char_ref.c \ -e '\@^#line [0-9]@s|^\(.*\)$|// \1|' +# Compile libgumbo.a with -fPIC +sed -i \ + gumbo-parser/src/Makefile \ + -e 's|^\(CFLAGS.*=.*\)$|\1 -fPIC|' + # Ummm... env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec %build # 1.6.0 needs this export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes -export V=1 %set_build_flags +# First build libgumbo.a +pushd gumbo-parser/src/ +make libgumbo.a +popd + %gem_install -find . -name compile.log | xargs cat # Permission chmod 0644 .%{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}.gem @@ -148,6 +154,9 @@ rm -rf .%{gem_instdir}/ext/java mkdir -p %{buildroot}%{gem_dir} cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir} +# Also first copy these, clean up later +cp -a ./gumbo-parser %{buildroot}%{gem_instdir}/ + # Remove backup file find %{buildroot} -name \*.orig_\* | xargs rm -vf @@ -197,8 +206,6 @@ find src -type f | \ popd rm -f %{buildroot}%{gem_cache} -# Remove bundled gumbo parser - %check # Ah.... # test_exslt(TestXsltTransforms) [./test/test_xslt_transforms.rb:93] From 314c62f1a4765a3f403aa91e72892636d00cd524 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 7 Aug 2021 20:23:29 +0900 Subject: [PATCH 021/103] update to 1.12.1 --- rubygem-nokogiri.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 08bb4bd..02337d4 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.12.1 +%global mainver 1.12.2 #%%global prever .rc4 -%global mainrel 0.101 +%global mainrel 0.100 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -101,11 +101,6 @@ sed -i \ # Actually not needed when using system libraries sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec -# We install C extension module into different path -sed -i \ - lib/nokogiri/extension.rb \ - -e 's@require_relative "@require "nokogiri/@' - # Don't use mini_portile2, but build libgumbo.a first and # tell extconf.rb the path to the archive sed -i \ @@ -265,6 +260,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Aug 7 2021 Mamoru TASAKA - 1.12.2-1 +- 1.12.2 + * Sat Aug 7 2021 Mamoru TASAKA - 1.12.1-1 - 1.12.1 From 9a9b27952d6c1de88fd0ad0ce5c17dfef5efe620 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 7 Aug 2021 20:26:27 +0900 Subject: [PATCH 022/103] 1.12.2 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cddfe55..cc5ba66 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.11.4-full.tar.gz /nokogiri-1.11.7.gem /rubygem-nokogiri-1.11.7-full.tar.gz +/nokogiri-1.12.2.gem +/rubygem-nokogiri-1.12.2-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 02337d4..de6dcca 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.12.2 #%%global prever .rc4 -%global mainrel 0.100 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri diff --git a/sources b/sources index 4e7781e..e6db439 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.11.7.gem) = 9af016366aa9d7bcfa3e6aeaf9d45ab1893ccf7f87cc89e3bff4573f66af0773dbbbe2a955e0e111bd8159f99ea49cef72ae7641398b3015e9ccd918b6804b1a -SHA512 (rubygem-nokogiri-1.11.7-full.tar.gz) = 2d45181bbb760ace73accdf84def5f875040a2383d6b2b80f86d94edf2e0d03dce251b6accf611e66cda643037f80f178070194cc3ff553313b088caac647624 +SHA512 (nokogiri-1.12.2.gem) = 041342b0ba33412852b91ea1386a0119f6180df1a3fbe07cda470e46a3881b3cf2ee657a805b1ab10f9b4c357ba591f863a3aea23c9595198c480ba882828c49 +SHA512 (rubygem-nokogiri-1.12.2-full.tar.gz) = 8a8eceb858e5131b0b3ae76be9658725ffd27169a4a2aec8fe645abb4c3211560967218094c83adfd95ff825b7762392768c73e96970234c0b5942833568e91c From aab0989868949b6775bc757d622bc200b210fb8a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 12 Aug 2021 11:24:47 +0900 Subject: [PATCH 023/103] 1.12.3 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cc5ba66..9eac22b 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.11.7-full.tar.gz /nokogiri-1.12.2.gem /rubygem-nokogiri-1.12.2-full.tar.gz +/nokogiri-1.12.3.gem +/rubygem-nokogiri-1.12.3-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index de6dcca..13bd81d 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.12.2 +%global mainver 1.12.3 #%%global prever .rc4 %global mainrel 1 @@ -260,6 +260,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Aug 12 2021 Mamoru TASAKA - 1.12.3-1 +- 1.12.3 + * Sat Aug 7 2021 Mamoru TASAKA - 1.12.2-1 - 1.12.2 diff --git a/sources b/sources index e6db439..0f54669 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.12.2.gem) = 041342b0ba33412852b91ea1386a0119f6180df1a3fbe07cda470e46a3881b3cf2ee657a805b1ab10f9b4c357ba591f863a3aea23c9595198c480ba882828c49 -SHA512 (rubygem-nokogiri-1.12.2-full.tar.gz) = 8a8eceb858e5131b0b3ae76be9658725ffd27169a4a2aec8fe645abb4c3211560967218094c83adfd95ff825b7762392768c73e96970234c0b5942833568e91c +SHA512 (nokogiri-1.12.3.gem) = cb59e63641d49bc12a510e4c2af9af05b90520c9333680d8de7d18112a8bf569d8fc2df18286855946aa54c95058eb2cf42cb3e23b37fe7ca401544879fbbb41 +SHA512 (rubygem-nokogiri-1.12.3-full.tar.gz) = f350c1827fb1f04f82266b89b32edfa9955371fe226af970c48571dd763484482406da0533eb2ec33dd8f613eb5185aef006baab3c4d8b52a7fee33df4f1743d From 415bc1af8d150d091b99981a0b64dddb0aae8b89 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Sep 2021 16:39:23 +0900 Subject: [PATCH 024/103] 1.12.4 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9eac22b..b4fa3a4 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.12.2-full.tar.gz /nokogiri-1.12.3.gem /rubygem-nokogiri-1.12.3-full.tar.gz +/nokogiri-1.12.4.gem +/rubygem-nokogiri-1.12.4-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 13bd81d..5e02de3 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.12.3 +%global mainver 1.12.4 #%%global prever .rc4 %global mainrel 1 @@ -260,6 +260,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Sep 1 2021 Mamoru TASAKA - 1.12.4-1 +- 1.12.4 + * Thu Aug 12 2021 Mamoru TASAKA - 1.12.3-1 - 1.12.3 diff --git a/sources b/sources index 0f54669..eda1a0f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.12.3.gem) = cb59e63641d49bc12a510e4c2af9af05b90520c9333680d8de7d18112a8bf569d8fc2df18286855946aa54c95058eb2cf42cb3e23b37fe7ca401544879fbbb41 -SHA512 (rubygem-nokogiri-1.12.3-full.tar.gz) = f350c1827fb1f04f82266b89b32edfa9955371fe226af970c48571dd763484482406da0533eb2ec33dd8f613eb5185aef006baab3c4d8b52a7fee33df4f1743d +SHA512 (nokogiri-1.12.4.gem) = cc590261b4fb475cd34cebf7cfb94d3a673250487e6f3b25923cfc689bb055aab1e16b727388becf2a2f0236801053495e5caaf25cbcd9e849da56b365f20dcb +SHA512 (rubygem-nokogiri-1.12.4-full.tar.gz) = b6473f8fdd2cea52738f226135de69912240333bf9e36f373640029aec22236c1db8458077688fd30ae85f449a147290cf166c24aaf1f3d07c2a3b2f1b72a732 From ae3545eb709696b79af7d1e4713ee68c37bc872b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 28 Sep 2021 16:03:15 +0900 Subject: [PATCH 025/103] 1.12.5 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b4fa3a4..eb9664e 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.12.3-full.tar.gz /nokogiri-1.12.4.gem /rubygem-nokogiri-1.12.4-full.tar.gz +/nokogiri-1.12.5.gem +/rubygem-nokogiri-1.12.5-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 5e02de3..4237e51 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.12.4 +%global mainver 1.12.5 #%%global prever .rc4 %global mainrel 1 @@ -260,6 +260,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Sep 28 2021 Mamoru TASAKA - 1.12.5-1 +- 1.12.5 + * Wed Sep 1 2021 Mamoru TASAKA - 1.12.4-1 - 1.12.4 diff --git a/sources b/sources index eda1a0f..eabc216 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.12.4.gem) = cc590261b4fb475cd34cebf7cfb94d3a673250487e6f3b25923cfc689bb055aab1e16b727388becf2a2f0236801053495e5caaf25cbcd9e849da56b365f20dcb -SHA512 (rubygem-nokogiri-1.12.4-full.tar.gz) = b6473f8fdd2cea52738f226135de69912240333bf9e36f373640029aec22236c1db8458077688fd30ae85f449a147290cf166c24aaf1f3d07c2a3b2f1b72a732 +SHA512 (nokogiri-1.12.5.gem) = 29ef38133906f3ffc4b8a3d8f980b5b684dcab21360a46fa618cc47caf1f98f51654a64648a1cc638d784a33336f24ce45a6ea43aa365caf39702e36ab75dbcf +SHA512 (rubygem-nokogiri-1.12.5-full.tar.gz) = f6674e84d4c51dba2e763463b5b1a622f8ce581a0d959f7d37e01f109b3c91417e25f63f031affedef49c393c40301a0e1b3478c3d136c9d1ac63946b3fd3c9e From eadac29df7bfb188bdcf7dd365510476cf3b63ff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Jan 2022 23:10:57 +0900 Subject: [PATCH 026/103] 1.13.0 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eb9664e..510ff13 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.12.4-full.tar.gz /nokogiri-1.12.5.gem /rubygem-nokogiri-1.12.5-full.tar.gz +/nokogiri-1.13.0.gem +/rubygem-nokogiri-1.13.0-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 4237e51..f017029 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.12.5 +%global mainver 1.13.0 #%%global prever .rc4 %global mainrel 1 @@ -260,6 +260,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Jan 9 2022 Mamoru TASAKA - 1.13.0-1 +- 1.13.0 + * Tue Sep 28 2021 Mamoru TASAKA - 1.12.5-1 - 1.12.5 diff --git a/sources b/sources index eabc216..96229e8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.12.5.gem) = 29ef38133906f3ffc4b8a3d8f980b5b684dcab21360a46fa618cc47caf1f98f51654a64648a1cc638d784a33336f24ce45a6ea43aa365caf39702e36ab75dbcf -SHA512 (rubygem-nokogiri-1.12.5-full.tar.gz) = f6674e84d4c51dba2e763463b5b1a622f8ce581a0d959f7d37e01f109b3c91417e25f63f031affedef49c393c40301a0e1b3478c3d136c9d1ac63946b3fd3c9e +SHA512 (nokogiri-1.13.0.gem) = 9541a8dc9c8568bd2a81a268cc6fadeacbc9be84093389050cc5d7fc3498a7c9c42cf9d0992a2bae4997ae3b05d04e1547bb9ce8911bdb97a5b5e35ee3c31d1a +SHA512 (rubygem-nokogiri-1.13.0-full.tar.gz) = 6d898dc7fbb1864fa26ec01714cbd8afc08053017ad89f1f3d2592730791c1606b8681bd5a7ccf6050b54df615a07a24dd45cbe37754c30b95cbaa7ad83a06d1 From 7819bac478e52e35eb359438e633c4eaaac0fee0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Jan 2022 11:11:49 +0900 Subject: [PATCH 027/103] 1.13.1 --- .gitignore | 2 ++ rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 510ff13..2223f93 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,5 @@ nokogiri-1.4.3.1.gem /rubygem-nokogiri-1.12.5-full.tar.gz /nokogiri-1.13.0.gem /rubygem-nokogiri-1.13.0-full.tar.gz +/nokogiri-1.13.1.gem +/rubygem-nokogiri-1.13.1-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index f017029..7360559 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.13.0 +%global mainver 1.13.1 #%%global prever .rc4 %global mainrel 1 @@ -260,6 +260,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jan 14 2022 Mamoru TASAKA - 1.13.1-1 +- 1.13.1 + * Sun Jan 9 2022 Mamoru TASAKA - 1.13.0-1 - 1.13.0 diff --git a/sources b/sources index 96229e8..1d5eb77 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.0.gem) = 9541a8dc9c8568bd2a81a268cc6fadeacbc9be84093389050cc5d7fc3498a7c9c42cf9d0992a2bae4997ae3b05d04e1547bb9ce8911bdb97a5b5e35ee3c31d1a -SHA512 (rubygem-nokogiri-1.13.0-full.tar.gz) = 6d898dc7fbb1864fa26ec01714cbd8afc08053017ad89f1f3d2592730791c1606b8681bd5a7ccf6050b54df615a07a24dd45cbe37754c30b95cbaa7ad83a06d1 +SHA512 (nokogiri-1.13.1.gem) = 0ed89f53cdb6097c435856ddfa55eeef972a1e33d4e6db2fb8fc66f48827e2f863155b9468fc7cd1c17a7d1a5e2ce8adb91299e4425123034e823b74190cff26 +SHA512 (rubygem-nokogiri-1.13.1-full.tar.gz) = 6beb9a840baf40488245c58088d692e6df7d936b0866ddd4db8575855175b984992cad692d1b7e451dc0a4cbc5dbc9e7f0d6f3936da15a86a0d9abb5e28ef577 From 87c178f8e978d9f34995e989246f08a0e3190359 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:56:39 +0000 Subject: [PATCH 028/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 7360559..71e963e 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 # MIT: see LICENSE.md # ASL 2.0 @@ -260,6 +260,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.13.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 Mamoru TASAKA - 1.13.1-1 - 1.13.1 From 5a706b2f2a723ff9b6c5b55404303b7245614df3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 26 Jan 2022 23:09:57 +0900 Subject: [PATCH 029/103] F-36: rebuild against ruby31 --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 71e963e..cc7caf3 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.2 # MIT: see LICENSE.md # ASL 2.0 @@ -260,6 +260,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jan 26 2022 Mamoru TASAKA - 1.13.1-1.2 +- F-36: rebuild against ruby31 + * Fri Jan 21 2022 Fedora Release Engineering - 1.13.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fd30bc656ab01bc2cec7bb540ab4564db75a5efa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 01:01:48 +0900 Subject: [PATCH 030/103] Set NOKOGIRI_TEST_GC_LEVEL to major on ppc64le as ruby31 does not seem to support GC.compat on the platform --- rubygem-nokogiri.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index cc7caf3..2260dc8 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.13.1 #%%global prever .rc4 -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.2 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} # MIT: see LICENSE.md # ASL 2.0 @@ -215,13 +215,18 @@ pushd ./%{gem_instdir} # Remove unneeded simplecov coverage test sed -i test/helper.rb \ - -e '\@require.*simplecov@,\@^end$@d' + -e '\@require.*simplecov@,\@^end$@s|^|#|' # Remove minitest-reporters. It does not provide any additional value while # it blows up the dependency chain. sed -i '/require..minitest.reporters./ s/^/#/' test/helper.rb sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb +# PPC64LE with ruby3.1 does not seem to support GC.compact +%ifarch ppc64le x86_64 +export NOKOGIRI_TEST_GC_LEVEL=major +%endif + # Need investigation. For now anyway build env \ RUBYLIB=".:lib:test:ext" \ @@ -260,6 +265,10 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jan 26 2022 Mamoru TASAKA - 1.13.1-2 +- Set NOKOGIRI_TEST_GC_LEVEL to major on ppc64le as + ruby31 does not seem to support GC.compat on the platform + * Wed Jan 26 2022 Mamoru TASAKA - 1.13.1-1.2 - F-36: rebuild against ruby31 From 5f0bd740918a391adaf3e22611dbc732432b0136 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 01:06:20 +0900 Subject: [PATCH 031/103] oops... --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 2260dc8..02a1ff9 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -223,7 +223,7 @@ sed -i '/require..minitest.reporters./ s/^/#/' test/helper.rb sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb # PPC64LE with ruby3.1 does not seem to support GC.compact -%ifarch ppc64le x86_64 +%ifarch ppc64le export NOKOGIRI_TEST_GC_LEVEL=major %endif From 085421ec10035ba7f0fa0a2abdf4601e95ebd208 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 22 Feb 2022 22:09:47 +0900 Subject: [PATCH 032/103] 1.13.3 --- .gitignore | 82 ++----------------------------------------- rubygem-nokogiri.spec | 7 ++-- sources | 4 +-- 3 files changed, 9 insertions(+), 84 deletions(-) diff --git a/.gitignore b/.gitignore index 2223f93..bb5c82c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,80 +1,2 @@ -nokogiri-1.4.2.gem -nokogiri-1.4.3.1.gem -/nokogiri-1.5.0.beta.2.gem -/nokogiri-1.5.0.beta.3.gem -/nokogiri-1.5.0.beta.4.gem -/nokogiri-1.5.0.gem -/nokogiri-1.5.2.gem -/nokogiri-1.5.5.gem -/nokogiri-1.5.6.gem -/nokogiri-1.5.9.gem -/nokogiri-1.6.0.gem -/nokogiri-1.6.1.gem -/nokogiri-1.6.2.1.gem -/nokogiri-1.6.3.1.gem -/nokogiri-1.6.4.1.gem -/nokogiri-1.6.5.gem -/nokogiri-1.6.6.1.gem -/nokogiri-1.6.6.2.gem -/nokogiri-1.6.7.rc3.gem -/nokogiri-1.6.7.2.gem -/nokogiri-1.6.8.gem -/nokogiri-1.6.8.1.gem -/nokogiri-1.7.0.gem -/nokogiri-1.7.0.1.gem -/nokogiri-1.7.1.gem -/nokogiri-1.7.2.gem -/nokogiri-1.8.0.gem -/nokogiri-1.8.1.gem -/nokogiri-1.8.2.gem -/nokogiri-1.8.3.gem -/nokogiri-1.8.4.gem -/nokogiri-1.8.5.gem -/nokogiri-1.9.1.gem -/rubygem-nokogiri-1.9.1-full.tar.gz -/nokogiri-1.10.0.gem -/rubygem-nokogiri-1.10.0-full.tar.gz -/nokogiri-1.10.1.gem -/rubygem-nokogiri-1.10.1-full.tar.gz -/nokogiri-1.10.2.gem -/rubygem-nokogiri-1.10.2-full.tar.gz -/nokogiri-1.10.3.gem -/rubygem-nokogiri-1.10.3-full.tar.gz -/nokogiri-1.10.4.gem -/rubygem-nokogiri-1.10.4-full.tar.gz -/rubygem-nokogiri-1.10.5-full.tar.gz -/nokogiri-1.10.5.gem -/nokogiri-1.10.7.gem -/rubygem-nokogiri-1.10.7-full.tar.gz -/nokogiri-1.10.8.gem -/rubygem-nokogiri-1.10.8-full.tar.gz -/nokogiri-1.10.9.gem -/rubygem-nokogiri-1.10.9-full.tar.gz -/nokogiri-1.10.10.gem -/rubygem-nokogiri-1.10.10-full.tar.gz -/nokogiri-1.11.0.rc4.gem -/rubygem-nokogiri-1.11.0.rc4-full.tar.gz -/rubygem-nokogiri-1.11.0-full.tar.gz -/nokogiri-1.11.0.gem -/rubygem-nokogiri-1.11.1-full.tar.gz -/nokogiri-1.11.1.gem -/nokogiri-1.11.2.gem -/rubygem-nokogiri-1.11.2-full.tar.gz -/nokogiri-1.11.3.gem -/rubygem-nokogiri-1.11.3-full.tar.gz -/nokogiri-1.11.4.gem -/rubygem-nokogiri-1.11.4-full.tar.gz -/nokogiri-1.11.7.gem -/rubygem-nokogiri-1.11.7-full.tar.gz -/nokogiri-1.12.2.gem -/rubygem-nokogiri-1.12.2-full.tar.gz -/nokogiri-1.12.3.gem -/rubygem-nokogiri-1.12.3-full.tar.gz -/nokogiri-1.12.4.gem -/rubygem-nokogiri-1.12.4-full.tar.gz -/nokogiri-1.12.5.gem -/rubygem-nokogiri-1.12.5-full.tar.gz -/nokogiri-1.13.0.gem -/rubygem-nokogiri-1.13.0-full.tar.gz -/nokogiri-1.13.1.gem -/rubygem-nokogiri-1.13.1-full.tar.gz +/nokogiri-*.gem +/rubygem-nokogiri-*-full.tar.gz diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 02a1ff9..6fad865 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.13.1 +%global mainver 1.13.3 #%%global prever .rc4 -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -265,6 +265,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Feb 22 2022 Mamoru TASAKA - 1.13.3-1 +- 1.13.3 + * Wed Jan 26 2022 Mamoru TASAKA - 1.13.1-2 - Set NOKOGIRI_TEST_GC_LEVEL to major on ppc64le as ruby31 does not seem to support GC.compat on the platform diff --git a/sources b/sources index 1d5eb77..1170ec9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.1.gem) = 0ed89f53cdb6097c435856ddfa55eeef972a1e33d4e6db2fb8fc66f48827e2f863155b9468fc7cd1c17a7d1a5e2ce8adb91299e4425123034e823b74190cff26 -SHA512 (rubygem-nokogiri-1.13.1-full.tar.gz) = 6beb9a840baf40488245c58088d692e6df7d936b0866ddd4db8575855175b984992cad692d1b7e451dc0a4cbc5dbc9e7f0d6f3936da15a86a0d9abb5e28ef577 +SHA512 (nokogiri-1.13.3.gem) = d704ed5ea6af3e066e3ddefd74cb15d0feed359b90c3b75b83a8f1ff85d8d4ca5b22a47c6848a2043a84f217e9d6b5ca861125d60ed0f88cb53690eb3726b3e7 +SHA512 (rubygem-nokogiri-1.13.3-full.tar.gz) = 7676d44e4ff11f0f5c39015d7d11b8bda0ad3b7aaf8be5acf5684c83ed619923b721a9dd3b5540a55a08c7c7cf538591b13c03b08d30200767d5cc4f236dd27a From 22432b39266ed47c43354ea7ddfdb2bc47cd7f05 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 14 Apr 2022 16:48:17 +0900 Subject: [PATCH 033/103] 1.13.4 Addresses CVE-2022-24836 --- rubygem-nokogiri.spec | 11 ++++++----- sources | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 6fad865..bb878e7 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.13.3 +%global mainver 1.13.4 #%%global prever .rc4 %global mainrel 1 @@ -7,7 +7,6 @@ %global gem_name nokogiri %undefine __brp_mangle_shebangs -%undefine _changelog_trimtime Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} @@ -140,7 +139,7 @@ popd chmod 0644 .%{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}.gem # Remove precompiled Java .jar file -rm -f .%{gem_instdir}/lib/*.jar +find .%{gem_instdir}/lib/ -name '*.jar' -delete # For now remove JRuby support rm -rf .%{gem_instdir}/ext/java @@ -227,14 +226,12 @@ sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb export NOKOGIRI_TEST_GC_LEVEL=major %endif -# Need investigation. For now anyway build env \ RUBYLIB=".:lib:test:ext" \ ruby \ -e \ "require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \ exit 1 - echo "Please investigate this" for f in $SKIPTEST do @@ -265,6 +262,10 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Apr 14 2022 Mamoru TASAKA - 1.13.4-1 +- 1.13.4 +- Addresses CVE-2022-24836 + * Tue Feb 22 2022 Mamoru TASAKA - 1.13.3-1 - 1.13.3 diff --git a/sources b/sources index 1170ec9..3513b53 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.3.gem) = d704ed5ea6af3e066e3ddefd74cb15d0feed359b90c3b75b83a8f1ff85d8d4ca5b22a47c6848a2043a84f217e9d6b5ca861125d60ed0f88cb53690eb3726b3e7 -SHA512 (rubygem-nokogiri-1.13.3-full.tar.gz) = 7676d44e4ff11f0f5c39015d7d11b8bda0ad3b7aaf8be5acf5684c83ed619923b721a9dd3b5540a55a08c7c7cf538591b13c03b08d30200767d5cc4f236dd27a +SHA512 (nokogiri-1.13.4.gem) = f2982819aa6d2bce87fc6e9d67e5b06a7f75c85d926eca306b2a13f00ec18c05650e510b1897610171901c891db8231e6ad850cad33d66e7f7a530b3869528af +SHA512 (rubygem-nokogiri-1.13.4-full.tar.gz) = a2fb523390f460ef3000bcc2b4685f10b43e2ec38789e527e171ca4ec8d0703abe7b009535cc801d3a289b3de1845149a8091692a2828059d76a8997d311ef1b From 38670e2964f5ea53f887e2616190b93555f242c2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 May 2022 15:35:49 +0900 Subject: [PATCH 034/103] 1.13.5 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index bb878e7..5e00d7d 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.13.4 +%global mainver 1.13.5 #%%global prever .rc4 %global mainrel 1 @@ -262,6 +262,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu May 5 2022 Mamoru TASAKA - 1.13.5-1 +- 1.13.5 + * Thu Apr 14 2022 Mamoru TASAKA - 1.13.4-1 - 1.13.4 - Addresses CVE-2022-24836 diff --git a/sources b/sources index 3513b53..beef380 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.4.gem) = f2982819aa6d2bce87fc6e9d67e5b06a7f75c85d926eca306b2a13f00ec18c05650e510b1897610171901c891db8231e6ad850cad33d66e7f7a530b3869528af -SHA512 (rubygem-nokogiri-1.13.4-full.tar.gz) = a2fb523390f460ef3000bcc2b4685f10b43e2ec38789e527e171ca4ec8d0703abe7b009535cc801d3a289b3de1845149a8091692a2828059d76a8997d311ef1b +SHA512 (nokogiri-1.13.5.gem) = 68d8b60d7f9a3993924cd055a2cbab1397034a4fb0634a9b3a0c7015096fce5b519ff6d2eac11769834a02ebbd17d4a02e598db0f2e887a7e12d3b72f6e3e2f7 +SHA512 (rubygem-nokogiri-1.13.5-full.tar.gz) = ea9d2948b21638348b41816e03724aa007874497eb7725a4d641eb4d0a2723c074df18cbe2b7ac0ee2bdb377944eee6fd34db9de8d7b7d8243f326bb47b6c2e1 From 920d20cfbf75e59f91f05e6b01982bf0c1660946 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 May 2022 17:52:03 +0900 Subject: [PATCH 035/103] 1.13.6 Addresses CVE-2022-29181 --- rubygem-nokogiri.spec | 6 +++++- sources | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 5e00d7d..bd0edd5 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.13.5 +%global mainver 1.13.6 #%%global prever .rc4 %global mainrel 1 @@ -262,6 +262,10 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu May 10 2022 Mamoru TASAKA - 1.13.6-1 +- 1.13.6 +- Addresses CVE-2022-29181 + * Thu May 5 2022 Mamoru TASAKA - 1.13.5-1 - 1.13.5 diff --git a/sources b/sources index beef380..56ea3c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.5.gem) = 68d8b60d7f9a3993924cd055a2cbab1397034a4fb0634a9b3a0c7015096fce5b519ff6d2eac11769834a02ebbd17d4a02e598db0f2e887a7e12d3b72f6e3e2f7 -SHA512 (rubygem-nokogiri-1.13.5-full.tar.gz) = ea9d2948b21638348b41816e03724aa007874497eb7725a4d641eb4d0a2723c074df18cbe2b7ac0ee2bdb377944eee6fd34db9de8d7b7d8243f326bb47b6c2e1 +SHA512 (nokogiri-1.13.6.gem) = 1928b41b1e8f5e99792b8427b8228343d53deca56d472055b2afdf29d247637acc3403c5183be0f80e64b55ba20747a152ce5eebdaf90a4c431ca54010ce4b3f +SHA512 (rubygem-nokogiri-1.13.6-full.tar.gz) = 235f72e61112c49c8e21387bc0daa398c5a95eaefa55ba4a5d988aafdd36a577e09cc37f24e352b8617c99872feb11db2389130f1fa6771c1f03906474299d5a From 5592f1343f7453ab5e3def8f7d1bed3498820c81 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 May 2022 17:55:45 +0900 Subject: [PATCH 036/103] fix date --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index bd0edd5..a5991ba 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -262,7 +262,7 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog -* Thu May 10 2022 Mamoru TASAKA - 1.13.6-1 +* Tue May 10 2022 Mamoru TASAKA - 1.13.6-1 - 1.13.6 - Addresses CVE-2022-29181 From f1d0e8031c7ac48acedc5ab0cc93d35269b71ebd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Jul 2022 15:52:14 +0900 Subject: [PATCH 037/103] 1.13.7 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index a5991ba..08bef55 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.13.6 +%global mainver 1.13.7 #%%global prever .rc4 %global mainrel 1 @@ -262,6 +262,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jul 13 2022 Mamoru TASAKA - 1.13.7-1 +- 1.13.7 + * Tue May 10 2022 Mamoru TASAKA - 1.13.6-1 - 1.13.6 - Addresses CVE-2022-29181 diff --git a/sources b/sources index 56ea3c0..4047f4e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.6.gem) = 1928b41b1e8f5e99792b8427b8228343d53deca56d472055b2afdf29d247637acc3403c5183be0f80e64b55ba20747a152ce5eebdaf90a4c431ca54010ce4b3f -SHA512 (rubygem-nokogiri-1.13.6-full.tar.gz) = 235f72e61112c49c8e21387bc0daa398c5a95eaefa55ba4a5d988aafdd36a577e09cc37f24e352b8617c99872feb11db2389130f1fa6771c1f03906474299d5a +SHA512 (nokogiri-1.13.7.gem) = 6eecabddd3193f732f097b33f154a2277bebe4f24219000eed9ed0b0b99db9b0a992f819c36924c92a31716367e205b3fa38e6d96cd27ea384eb5361b352873f +SHA512 (rubygem-nokogiri-1.13.7-full.tar.gz) = 4cb323eb6a46cea216a32e70302a95af2078b4d1125c8a080382c7b77d6d16eaf10e1cae0d432180be25230c364f66573c20be21b045035d4f567df70b6aad2e From edb492c8c00e070823006f4a84406645b4cb3f03 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Jul 2022 22:29:37 +0900 Subject: [PATCH 038/103] disable gc compaction test on ppc64le --- rubygem-nokogiri.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 08bef55..0eda88f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -224,6 +224,11 @@ sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb # PPC64LE with ruby3.1 does not seem to support GC.compact %ifarch ppc64le export NOKOGIRI_TEST_GC_LEVEL=major +# F36 ruby has not implemented runtime GC compaction support yet +# c.f https://src.fedoraproject.org/rpms/ruby/pull-request/126 +%if 0%{?fedora} <= 36 +sed -i test/test_compaction.rb -e 's|skip unless GC.respond_to.*|skip|' +%endif %endif env \ From 12e110809afab4a6d374b7e9f09d51c684ea6002 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Jul 2022 22:31:41 +0900 Subject: [PATCH 039/103] bump --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 0eda88f..3af06aa 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.13.7 #%%global prever .rc4 -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -267,6 +267,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jul 13 2022 Mamoru TASAKA - 1.13.7-2 +- Bump release + * Wed Jul 13 2022 Mamoru TASAKA - 1.13.7-1 - 1.13.7 From 451852be6bf9478435045e590ed5c468cb11d855 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:58:50 +0000 Subject: [PATCH 040/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 3af06aa..63f6934 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -11,7 +11,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 # MIT: see LICENSE.md # ASL 2.0 @@ -267,6 +267,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.13.7-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 13 2022 Mamoru TASAKA - 1.13.7-2 - Bump release From 469d222023cad2e3b99f278aae49888360b2a125 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 27 Jul 2022 16:45:07 +0900 Subject: [PATCH 041/103] 1.13.8 --- rubygem-nokogiri.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 63f6934..94c10a7 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.13.7 +%global mainver 1.13.8 #%%global prever .rc4 -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -11,7 +11,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} # MIT: see LICENSE.md # ASL 2.0 @@ -267,6 +267,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jul 27 2022 Mamoru TASAKA - 1.13.8-1 +- 1.13.8 + * Sat Jul 23 2022 Fedora Release Engineering - 1.13.7-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 4047f4e..37abb33 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.7.gem) = 6eecabddd3193f732f097b33f154a2277bebe4f24219000eed9ed0b0b99db9b0a992f819c36924c92a31716367e205b3fa38e6d96cd27ea384eb5361b352873f -SHA512 (rubygem-nokogiri-1.13.7-full.tar.gz) = 4cb323eb6a46cea216a32e70302a95af2078b4d1125c8a080382c7b77d6d16eaf10e1cae0d432180be25230c364f66573c20be21b045035d4f567df70b6aad2e +SHA512 (nokogiri-1.13.8.gem) = 5fd9a62e76e7b59342245ae41b15b46a408eabd289afa0ef6238b3d01af5c44c737c1ffd7f17791d7501dd240aa1c53e6d49c2e97580fc226de90f5a60b62e33 +SHA512 (rubygem-nokogiri-1.13.8-full.tar.gz) = 59ae4722d86990da5740a2a69f4827f4b3e1698c00536b417a860f3d601bb4c28b4fef22ec0f6797ac9f9142f67eadc8a10abe2fba92c8ef8fc6ae4fafb6462c From 0318d6b1b1b8cca23c090d52a2a2d7be6dd5b361 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 20 Oct 2022 18:16:22 +0900 Subject: [PATCH 042/103] 1.13.9 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 94c10a7..252fee2 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.13.8 +%global mainver 1.13.9 #%%global prever .rc4 %global mainrel 1 @@ -267,6 +267,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Oct 20 2022 Mamoru TASAKA - 1.13.9-1 +- 1.13.9 + * Wed Jul 27 2022 Mamoru TASAKA - 1.13.8-1 - 1.13.8 diff --git a/sources b/sources index 37abb33..06b1788 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.8.gem) = 5fd9a62e76e7b59342245ae41b15b46a408eabd289afa0ef6238b3d01af5c44c737c1ffd7f17791d7501dd240aa1c53e6d49c2e97580fc226de90f5a60b62e33 -SHA512 (rubygem-nokogiri-1.13.8-full.tar.gz) = 59ae4722d86990da5740a2a69f4827f4b3e1698c00536b417a860f3d601bb4c28b4fef22ec0f6797ac9f9142f67eadc8a10abe2fba92c8ef8fc6ae4fafb6462c +SHA512 (nokogiri-1.13.9.gem) = 207161fcf74aa1d1550841765268746e72d74b7516b34daf61cc5e7dc6af8fec4866f2734cd53afaf17fc546c92c3709a72f9e72da13071f65465855abf89bfa +SHA512 (rubygem-nokogiri-1.13.9-full.tar.gz) = 848c791f30b3d2f2ffa68931d9db481210672b91c0e655f1fcc6b753bba87c8986ea7ae3f537cc8e612fc3f3e7dd249da899ad99d15fd96d2fa77235373e1448 From 926b631961bfe6d5066eedec35c9150eedce6639 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 20 Oct 2022 21:02:09 +0900 Subject: [PATCH 043/103] s390x: change GC_LEVEL to major on ruby3.2 for now --- rubygem-nokogiri.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 252fee2..0488b5f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.13.9 #%%global prever .rc4 -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -230,6 +230,13 @@ export NOKOGIRI_TEST_GC_LEVEL=major sed -i test/test_compaction.rb -e 's|skip unless GC.respond_to.*|skip|' %endif %endif +%ifarch s390x +# With ruby 3.2 GC_LEVEL=compact seems to cause segfault: +# change to major for now +if pkg-config --atleast-version 3.2 ruby ; then +export NOKOGIRI_TEST_GC_LEVEL=major +fi +%endif env \ RUBYLIB=".:lib:test:ext" \ @@ -267,6 +274,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Oct 20 2022 Mamoru TASAKA - 1.13.9-2 +- s390x: change GC_LEVEL to major on ruby3.2 for now + * Thu Oct 20 2022 Mamoru TASAKA - 1.13.9-1 - 1.13.9 From 69ea66331a4ee62a0e2771e476ff4c68fa1809f6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Dec 2022 14:28:57 +0900 Subject: [PATCH 044/103] 1.13.10 Address CVE-2022-23476 --- rubygem-nokogiri.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 0488b5f..3a187b7 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.13.9 +%global mainver 1.13.10 #%%global prever .rc4 -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -274,6 +274,10 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Dec 9 2022 Mamoru TASAKA - 1.13.10-1 +- 1.13.10 +- Address CVE-2022-23476 + * Thu Oct 20 2022 Mamoru TASAKA - 1.13.9-2 - s390x: change GC_LEVEL to major on ruby3.2 for now diff --git a/sources b/sources index 06b1788..89c1e92 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.9.gem) = 207161fcf74aa1d1550841765268746e72d74b7516b34daf61cc5e7dc6af8fec4866f2734cd53afaf17fc546c92c3709a72f9e72da13071f65465855abf89bfa -SHA512 (rubygem-nokogiri-1.13.9-full.tar.gz) = 848c791f30b3d2f2ffa68931d9db481210672b91c0e655f1fcc6b753bba87c8986ea7ae3f537cc8e612fc3f3e7dd249da899ad99d15fd96d2fa77235373e1448 +SHA512 (nokogiri-1.13.10.gem) = aee3417d99a07c522d3fa479eddc952c4ec215a96e0dec9b6109af02855d5313d4b62d54544d36ed1a50f7993510d8fdc6fb93af4ae4bb289cc85f5d7ebb1556 +SHA512 (rubygem-nokogiri-1.13.10-full.tar.gz) = 780eae99316289c3365a383d20f3da20e52af8a636b4c403942ad8a65487f8da5bb22d48df85aab0ec9cb934c52f40478554d56868022077336fad434c6dadc2 From 39e9f995640264e162dbbadbdb937e2665f0ac97 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Dec 2022 16:03:59 +0900 Subject: [PATCH 045/103] Use %gem_extdir_mri instead of ext for %check due to ruby3.2 change for ext cleanup during build --- rubygem-nokogiri.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 3a187b7..4a3aa7f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.13.10 #%%global prever .rc4 -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -239,7 +239,7 @@ fi %endif env \ - RUBYLIB=".:lib:test:ext" \ + RUBYLIB=".:lib:test:%{buildroot}%{gem_extdir_mri}" \ ruby \ -e \ "require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \ @@ -274,6 +274,10 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Dec 25 2022 Mamoru TASAKA - 1.13.10-2 +- Use %%gem_extdir_mri instead of ext for %%check due to ruby3.2 change + for ext cleanup during build + * Fri Dec 9 2022 Mamoru TASAKA - 1.13.10-1 - 1.13.10 - Address CVE-2022-23476 From 3093935978c374ef614f6b734830db3728c75092 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 4 Jan 2023 08:24:50 +0900 Subject: [PATCH 046/103] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 4a3aa7f..03d378f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -11,7 +11,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 # MIT: see LICENSE.md # ASL 2.0 @@ -274,6 +274,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Jan 03 2023 Mamoru TASAKA - 1.13.10-2.1 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 + * Sun Dec 25 2022 Mamoru TASAKA - 1.13.10-2 - Use %%gem_extdir_mri instead of ext for %%check due to ruby3.2 change for ext cleanup during build From 695154553862376a473e18149b12415121d49faf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Jan 2023 16:02:24 +0900 Subject: [PATCH 047/103] 1.14.0 --- rubygem-nokogiri.spec | 14 +++++++++----- sources | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 03d378f..b913298 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.13.10 +%global mainver 1.14.10 #%%global prever .rc4 -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -11,14 +11,14 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} # MIT: see LICENSE.md -# ASL 2.0 +# Apache-2.0 # 1.12.0 bundles forked and modified gumbo - # see gumbo-parser/src/attribute.c and ext/nokogiri/gumbo.c # also lib/nokogiri/html5 is licensed under ASL 2.0 -License: MIT and ASL 2.0 +License: MIT and Apache-2.0 Provides: bundled(gumbo-parser) = 0.10.1 URL: https://nokogiri.org @@ -183,6 +183,7 @@ cp -p %{gem_name}-%{version}/[A-Z]* %{buildroot}%{gem_instdir}/ pushd %{buildroot}%{gem_instdir} rm -rf \ Gemfile* \ + Rakefile \ dependencies.yml \ ext \ *gemspec \ @@ -274,6 +275,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Jan 15 2023 Mamoru TASAKA - 1.14.0-1 +- 1.14.0 + * Tue Jan 03 2023 Mamoru TASAKA - 1.13.10-2.1 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 diff --git a/sources b/sources index 89c1e92..38f152c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.13.10.gem) = aee3417d99a07c522d3fa479eddc952c4ec215a96e0dec9b6109af02855d5313d4b62d54544d36ed1a50f7993510d8fdc6fb93af4ae4bb289cc85f5d7ebb1556 -SHA512 (rubygem-nokogiri-1.13.10-full.tar.gz) = 780eae99316289c3365a383d20f3da20e52af8a636b4c403942ad8a65487f8da5bb22d48df85aab0ec9cb934c52f40478554d56868022077336fad434c6dadc2 +SHA512 (nokogiri-1.14.0.gem) = 8c941c09773bbd2a998f10dd6cbf5721e753f7c0133eb1aecfae9e4e5db387da546c07495ce63aa3654b7d3c09435aaeef48fbb1bc20c4d6e548537bd3dcdda6 +SHA512 (rubygem-nokogiri-1.14.0-full.tar.gz) = 3e4cbcc76fd5ecd790a68d290198b11ef4cb6ad09001b23d02b8a16611c072333b46c40584becff6c388f7880fe3c2340068eb5ccb2d829af0a8edd8b6e32e37 From e2e0818fc634a642a701681cda130aafd74bcb76 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Jan 2023 16:09:45 +0900 Subject: [PATCH 048/103] fix version --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index b913298..a35c8c9 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.14.10 +%global mainver 1.14.0 #%%global prever .rc4 %global mainrel 1 From b461eb53e63f2d53fea4dda4e72870078c2126b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 20:50:25 +0000 Subject: [PATCH 049/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index a35c8c9..af252c1 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -11,7 +11,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 # MIT: see LICENSE.md # Apache-2.0 @@ -275,6 +275,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.14.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Jan 15 2023 Mamoru TASAKA - 1.14.0-1 - 1.14.0 From 22b962d7b26a3a9f3a15a9165e32bdd342e1cdaa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 31 Jan 2023 15:47:18 +0900 Subject: [PATCH 050/103] 1.14.1 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index af252c1..9728342 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.14.0 +%global mainver 1.14.1 #%%global prever .rc4 %global mainrel 1 @@ -11,7 +11,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} # MIT: see LICENSE.md # Apache-2.0 @@ -275,6 +275,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Jan 31 2023 Mamoru TASAKA - 1.14.1-1 +- 1.14.1 + * Fri Jan 20 2023 Fedora Release Engineering - 1.14.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 38f152c..155082c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.14.0.gem) = 8c941c09773bbd2a998f10dd6cbf5721e753f7c0133eb1aecfae9e4e5db387da546c07495ce63aa3654b7d3c09435aaeef48fbb1bc20c4d6e548537bd3dcdda6 -SHA512 (rubygem-nokogiri-1.14.0-full.tar.gz) = 3e4cbcc76fd5ecd790a68d290198b11ef4cb6ad09001b23d02b8a16611c072333b46c40584becff6c388f7880fe3c2340068eb5ccb2d829af0a8edd8b6e32e37 +SHA512 (nokogiri-1.14.1.gem) = 655792e2dbae59e1924691ea4e9b77f029185ff588f366fefa93af34aceff8a814a0fe712c715df50f0d539fc588cc1bf08774c975b76973e174054ffab03753 +SHA512 (rubygem-nokogiri-1.14.1-full.tar.gz) = 7be6182b94c7d5d547921208c2a0d3a4601c3b16a5f8a84a3c251737ed25c6b444e242f68d1ca042c8761f6acdc8495f09db2f12d7281d36df1187c816ed558a From b299dbbf6e24583907c8fea44b4094dcfc06406c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 31 Jan 2023 16:38:24 +0900 Subject: [PATCH 051/103] add missing BR --- rubygem-nokogiri.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 9728342..5274a2d 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -36,6 +36,7 @@ BuildRequires: ruby(rubygems) ## ## For %%check BuildRequires: rubygem(minitest) +BuildRequires: rubygem(rubyzip) BuildRequires: rubygems-devel Obsoletes: ruby-%{gem_name} <= 1.5.2-2 #BuildRequires: ruby(racc) From 9a1ef2f0805206ce8fc0853e96798c8f790d6ae8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 Feb 2023 14:38:59 +0900 Subject: [PATCH 052/103] 1.14.2 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 5274a2d..8464337 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.14.1 +%global mainver 1.14.2 #%%global prever .rc4 %global mainrel 1 @@ -276,6 +276,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Feb 14 2023 Mamoru TASAKA - 1.14.2-1 +- 1.14.2 + * Tue Jan 31 2023 Mamoru TASAKA - 1.14.1-1 - 1.14.1 diff --git a/sources b/sources index 155082c..f7c49be 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.14.1.gem) = 655792e2dbae59e1924691ea4e9b77f029185ff588f366fefa93af34aceff8a814a0fe712c715df50f0d539fc588cc1bf08774c975b76973e174054ffab03753 -SHA512 (rubygem-nokogiri-1.14.1-full.tar.gz) = 7be6182b94c7d5d547921208c2a0d3a4601c3b16a5f8a84a3c251737ed25c6b444e242f68d1ca042c8761f6acdc8495f09db2f12d7281d36df1187c816ed558a +SHA512 (nokogiri-1.14.2.gem) = b905cdc7988b1f0fb273d6ab5d1ba889c124cd2441730d15df5517d7860bdb6626460bfde7f16a81fa41c8bff29b17fd2a3f9bc3a34d188a45bc155137a45c3c +SHA512 (rubygem-nokogiri-1.14.2-full.tar.gz) = 84208b9ccb99c415510137bc8398eb0a39bc7235f9b728b14bb1d880b7ca5e3703ebe84170ba749868fe212d4a2f8b14479da50ed12bf143a9e2e5b446a63ad3 From 1a31ee12a66d4499387de1e24765b6fb82be288e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 18 Mar 2023 16:27:04 +0900 Subject: [PATCH 053/103] SPDX confirmed --- rubygem-nokogiri.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 8464337..8b8360a 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -13,12 +13,13 @@ Name: rubygem-%{gem_name} Version: %{mainver} Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +# SPDX confirmed # MIT: see LICENSE.md # Apache-2.0 # 1.12.0 bundles forked and modified gumbo - # see gumbo-parser/src/attribute.c and ext/nokogiri/gumbo.c # also lib/nokogiri/html5 is licensed under ASL 2.0 -License: MIT and Apache-2.0 +License: MIT AND Apache-2.0 Provides: bundled(gumbo-parser) = 0.10.1 URL: https://nokogiri.org From c83119a48bec43180f84ca3e44fd8c13c1888fce Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:28:45 +0900 Subject: [PATCH 054/103] use baserelease --- rubygem-nokogiri.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 8b8360a..3db8299 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.14.2 #%%global prever .rc4 -%global mainrel 1 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -11,7 +11,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}%{?dist} # SPDX confirmed # MIT: see LICENSE.md From 56379ffefd42b84f435f223f757477ba1d88b660 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Apr 2023 19:30:33 +0900 Subject: [PATCH 055/103] 1.14.3 SPDX confirmed --- ...okogiri-1.5.0-allow-non-crosscompile.patch | 26 -------------- rubygem-nokogiri.spec | 36 +++++++++---------- sources | 4 +-- 3 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch diff --git a/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch b/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch deleted file mode 100644 index f45734b..0000000 --- a/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- nokogiri-1.5.0/Rakefile.debug 2012-01-18 16:23:02.472224272 +0900 -+++ nokogiri-1.5.0/Rakefile 2012-01-18 16:23:29.935430496 +0900 -@@ -83,14 +83,21 @@ - HOE.spec.files += ['lib/nokogiri/nokogiri.jar'] - end - else -- require 'tasks/cross_compile' -+ do_cross_compile = true -+ begin -+ require 'tasks/cross_compile' -+ rescue RuntimeError => e -+ warn "WARNING: Could not perform some cross-compiling: #{e}" -+ do_cross_compile = false -+ end - require "rake/extensiontask" - -- HOE.spec.files.reject! { |f| f =~ %r{^ext/java|\.jar$} } -+ HOE.spec.files.reject! { |f| f =~ %r{^ext/java|\.jar$} } if do_cross_compile - - Rake::ExtensionTask.new("nokogiri", HOE.spec) do |ext| - ext.lib_dir = File.join(*['lib', 'nokogiri', ENV['FAT_DIR']].compact) - ext.config_options << ENV['EXTOPTS'] -+ next unless do_cross_compile - ext.cross_compile = true - ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"] - ext.cross_config_options << "--with-xml2-include=#{File.join($recipes[:libxml2].path, 'include', 'libxml2')}" diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 3db8299..e8da633 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.14.2 +%global mainver 1.14.3 #%%global prever .rc4 %global baserelease 1 @@ -27,9 +27,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz Source2: nokogiri-create-full-tarball.sh -# ./test/html/test_element_description.rb:62 fails, as usual...... -# Patch0: rubygem-nokogiri-1.5.0.beta3-test-failure.patch -#Patch0: rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch # Shut down libxml2 version unmatching warning Patch0: %{name}-1.11.0.rc4-shutdown-libxml2-warning.patch BuildRequires: ruby(release) @@ -60,16 +57,6 @@ correctly implemented CSS3 selector support as well as XPath support. Nokogiri also features an Hpricot compatibility layer to help ease the change to using correct CSS and XPath. -%if 0 -%package jruby -Summary: JRuby support for %{name} -Requires: %{name} = %{version}-%{release} - -%description jruby -This package contains JRuby support for %{name}. -%endif - - %package doc Summary: Documentation for %{name} Requires: %{name} = %{version}-%{release} @@ -92,7 +79,7 @@ This package provides non-Gem support for %{gem_name}. mv ../%{gem_name}-%{version}.gemspec . # patches -%patch0 -p1 +%patch -P0 -p1 # remove bundled external libraries sed -i \ @@ -122,10 +109,10 @@ sed -i \ gumbo-parser/src/Makefile \ -e 's|^\(CFLAGS.*=.*\)$|\1 -fPIC|' +%build # Ummm... env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec -%build # 1.6.0 needs this export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes @@ -186,6 +173,7 @@ pushd %{buildroot}%{gem_instdir} rm -rf \ Gemfile* \ Rakefile \ + Vagrantfile \ dependencies.yml \ ext \ *gemspec \ @@ -260,7 +248,9 @@ popd %{gem_extdir_mri}/ %dir %{gem_instdir}/ -%doc %{gem_instdir}/[A-Z]* +%license %{gem_instdir}/LICENSE*.md +%doc %{gem_instdir}/CHANGELOG.md +%doc %{gem_instdir}/README.md %{gem_instdir}/bin/ %{gem_instdir}/lib/ @@ -268,15 +258,23 @@ popd %dir %{gem_instdir}/gumbo-parser %dir %{gem_instdir}/gumbo-parser/src %doc %{gem_instdir}/gumbo-parser/[A-Z]* -%doc %{gem_instdir}/gumbo-parser/src/README.md +%license %{gem_instdir}/gumbo-parser/src/README.md %{gem_dir}/specifications/%{gem_name}-%{mainver}%{?prever}.gemspec %files doc %defattr(-,root,root,-) -%{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ +%doc %{gem_instdir}/CODE_OF_CONDUCT.md +%doc %{gem_instdir}/CONTRIBUTING.md +%doc %{gem_instdir}/ROADMAP.md +%doc %{gem_instdir}/SECURITY.md +%doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Apr 12 2023 Mamoru TASAKA - 1.14.3-1 +- 1.14.3 +- SPDX confirmed + * Tue Feb 14 2023 Mamoru TASAKA - 1.14.2-1 - 1.14.2 diff --git a/sources b/sources index f7c49be..9c35963 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.14.2.gem) = b905cdc7988b1f0fb273d6ab5d1ba889c124cd2441730d15df5517d7860bdb6626460bfde7f16a81fa41c8bff29b17fd2a3f9bc3a34d188a45bc155137a45c3c -SHA512 (rubygem-nokogiri-1.14.2-full.tar.gz) = 84208b9ccb99c415510137bc8398eb0a39bc7235f9b728b14bb1d880b7ca5e3703ebe84170ba749868fe212d4a2f8b14479da50ed12bf143a9e2e5b446a63ad3 +SHA512 (nokogiri-1.14.3.gem) = 1883ec99c2a72c16987bba4f5d8f81a67fa79a3492325db04457cf0667cc41eb3188a54130776cee2d962b545a8bc2df61e0244628bafb2bc10f0f3f7c48b364 +SHA512 (rubygem-nokogiri-1.14.3-full.tar.gz) = 5291551955ccb8746210518ceca7bbeaf8619b4d0a11ea8d294db7edbc1457298a097b5767048e24cf298c5150a9cf1c7c29c2f20febc0749b0dface87064ad8 From da65916f44ccc6cdcd275158e2f26059a4262061 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 May 2023 12:29:47 +0900 Subject: [PATCH 056/103] 1.14.4 Note that CVE-2022-34169 is for vendored xalan-j, not affecting Fedora nokogiri --- rubygem-nokogiri.spec | 7 ++++++- sources | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index e8da633..7e34f2f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.14.3 +%global mainver 1.14.4 #%%global prever .rc4 %global baserelease 1 @@ -271,6 +271,11 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri May 12 2023 Mamoru TASAKA - 1.14.4-1 +- 1.14.4 +- Note that CVE-2022-34169 is for vendored xalan-j, not affecting Fedora + nokogiri + * Wed Apr 12 2023 Mamoru TASAKA - 1.14.3-1 - 1.14.3 - SPDX confirmed diff --git a/sources b/sources index 9c35963..89027c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.14.3.gem) = 1883ec99c2a72c16987bba4f5d8f81a67fa79a3492325db04457cf0667cc41eb3188a54130776cee2d962b545a8bc2df61e0244628bafb2bc10f0f3f7c48b364 -SHA512 (rubygem-nokogiri-1.14.3-full.tar.gz) = 5291551955ccb8746210518ceca7bbeaf8619b4d0a11ea8d294db7edbc1457298a097b5767048e24cf298c5150a9cf1c7c29c2f20febc0749b0dface87064ad8 +SHA512 (nokogiri-1.14.4.gem) = 875c5dcacf8c3c383686d1cba07dadaf9631096ebd46c09c7c890d21fa802191d9c3d1895960f7cda7f928cda64342b14f21813d5e9f1feb40c7cb0f72792144 +SHA512 (rubygem-nokogiri-1.14.4-full.tar.gz) = 14999df5fb7e2723011f716b3fc16bd74a9c0079f4db5308466385ed17d3f4ee852090ae73125ed0c671809b6b1a0244c9611a30c1bbb310e14f938f4e0270dd From 460af1d8f29c8a8f3692b7b43e0158c9d4832025 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 16 May 2023 23:14:57 +0900 Subject: [PATCH 057/103] 1.15.0 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 7e34f2f..66d62dd 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.14.4 +%global mainver 1.15.0 #%%global prever .rc4 %global baserelease 1 @@ -271,6 +271,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue May 16 2023 Mamoru TASAKA - 1.15.0-1 +- 1.15.0 + * Fri May 12 2023 Mamoru TASAKA - 1.14.4-1 - 1.14.4 - Note that CVE-2022-34169 is for vendored xalan-j, not affecting Fedora diff --git a/sources b/sources index 89027c8..fd3afd6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.14.4.gem) = 875c5dcacf8c3c383686d1cba07dadaf9631096ebd46c09c7c890d21fa802191d9c3d1895960f7cda7f928cda64342b14f21813d5e9f1feb40c7cb0f72792144 -SHA512 (rubygem-nokogiri-1.14.4-full.tar.gz) = 14999df5fb7e2723011f716b3fc16bd74a9c0079f4db5308466385ed17d3f4ee852090ae73125ed0c671809b6b1a0244c9611a30c1bbb310e14f938f4e0270dd +SHA512 (nokogiri-1.15.0.gem) = 00a829953dbf083cba38bc0d80fdcfe4bb50ce83d2eab05ea879f9ccfda3117f72c31b480a4c859020480b5d530fbbd6181c4d3837cc0123903f9adb340b5a13 +SHA512 (rubygem-nokogiri-1.15.0-full.tar.gz) = 68d4ae47173c20da641ee054308ff29cc1328201249073b488ae03f7445fa88c78f016b3b608800a366392f2de6a20a4a88d5379848f7c1c8f7e0e137230f169 From b5ad61c47f6f654dd79aa1b92b01b8dd859ccecc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 May 2023 15:47:17 +0900 Subject: [PATCH 058/103] 1.15.1 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 66d62dd..932f572 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.15.0 +%global mainver 1.15.1 #%%global prever .rc4 %global baserelease 1 @@ -271,6 +271,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun May 21 2023 Mamoru TASAKA - 1.15.1-1 +- 1.15.1 + * Tue May 16 2023 Mamoru TASAKA - 1.15.0-1 - 1.15.0 diff --git a/sources b/sources index fd3afd6..8629aa6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.15.0.gem) = 00a829953dbf083cba38bc0d80fdcfe4bb50ce83d2eab05ea879f9ccfda3117f72c31b480a4c859020480b5d530fbbd6181c4d3837cc0123903f9adb340b5a13 -SHA512 (rubygem-nokogiri-1.15.0-full.tar.gz) = 68d4ae47173c20da641ee054308ff29cc1328201249073b488ae03f7445fa88c78f016b3b608800a366392f2de6a20a4a88d5379848f7c1c8f7e0e137230f169 +SHA512 (nokogiri-1.15.1.gem) = 8ccf24a0add7e4fc2081b7b449c2dd1d62fca2520c659a157522d45f0cffc6bf91a87e01a91407dc4285074c62a270fe1d1acf1fbadfb51d752b7bc199a27121 +SHA512 (rubygem-nokogiri-1.15.1-full.tar.gz) = 3aa968d3adb94a655d619556e5fd29f76bb9793468eccb88ec80f9f2446f6c8d0167451b253a5d04f718fcdbeed4ae43b888cd3c94b8d108d4918ffd485d6db0 From 0e7dac82ed829d4569bb3fef680090acc9f30d53 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 25 May 2023 14:36:05 +0900 Subject: [PATCH 059/103] 1.15.2 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 932f572..29f1be4 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.15.1 +%global mainver 1.15.2 #%%global prever .rc4 %global baserelease 1 @@ -271,6 +271,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu May 25 2023 Mamoru TASAKA - 1.15.2-1 +- 1.15.2 + * Sun May 21 2023 Mamoru TASAKA - 1.15.1-1 - 1.15.1 diff --git a/sources b/sources index 8629aa6..e12bfbd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.15.1.gem) = 8ccf24a0add7e4fc2081b7b449c2dd1d62fca2520c659a157522d45f0cffc6bf91a87e01a91407dc4285074c62a270fe1d1acf1fbadfb51d752b7bc199a27121 -SHA512 (rubygem-nokogiri-1.15.1-full.tar.gz) = 3aa968d3adb94a655d619556e5fd29f76bb9793468eccb88ec80f9f2446f6c8d0167451b253a5d04f718fcdbeed4ae43b888cd3c94b8d108d4918ffd485d6db0 +SHA512 (nokogiri-1.15.2.gem) = 0a0305d04b570f259d31ba71a7bc323f74d4e573395da549f757f5915d4a5b15678c9926de4f234e53d66d5afe227236cd3094598ff21f0dedd8daf3dc848b33 +SHA512 (rubygem-nokogiri-1.15.2-full.tar.gz) = cc7b6513c8f7f00735ad3ea64ecebdd15c3f2f7b5bd7fa4ae205ea69728ed131a1d2781284d1ee7919d3910cec931c9b73d166367bdd9901ffea790df5a5c3e6 From d67d56a0b75fd90341a518e96a826726b81ba5b7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 6 Jul 2023 17:21:53 +0900 Subject: [PATCH 060/103] 1.15.3 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 29f1be4..ec01a07 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.15.2 +%global mainver 1.15.3 #%%global prever .rc4 %global baserelease 1 @@ -271,6 +271,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Jul 6 2023 Mamoru TASAKA - 1.15.3-1 +- 1.15.3 + * Thu May 25 2023 Mamoru TASAKA - 1.15.2-1 - 1.15.2 diff --git a/sources b/sources index e12bfbd..452199e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.15.2.gem) = 0a0305d04b570f259d31ba71a7bc323f74d4e573395da549f757f5915d4a5b15678c9926de4f234e53d66d5afe227236cd3094598ff21f0dedd8daf3dc848b33 -SHA512 (rubygem-nokogiri-1.15.2-full.tar.gz) = cc7b6513c8f7f00735ad3ea64ecebdd15c3f2f7b5bd7fa4ae205ea69728ed131a1d2781284d1ee7919d3910cec931c9b73d166367bdd9901ffea790df5a5c3e6 +SHA512 (nokogiri-1.15.3.gem) = d5159f0ce8eb43e5dd65138cb17519bd15caec36889fde3fcef53e64261172e69d3676c0119c5ab247e19d5f8e8f03c3bbde2285cd8d0974cbf8a4be5e30c58d +SHA512 (rubygem-nokogiri-1.15.3-full.tar.gz) = bf460d2d588b9aecc07611709192bc2b604df99ff235c20eb7c6dc18b0e72f0b992d41ee2a5cddc8b0c3f5f665072c936da285ec01b33e6e132588f1914ffaf8 From b38035cdd058f5ae0cf80c7e6ce77b59c0b1704b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 18:05:02 +0000 Subject: [PATCH 061/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index ec01a07..7b3294f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.15.3 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -271,6 +271,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.15.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 6 2023 Mamoru TASAKA - 1.15.3-1 - 1.15.3 From 373e0fdadabca2e1a2f5363f72f3f4fe6a737d77 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 4 Aug 2023 14:55:58 +0900 Subject: [PATCH 062/103] Support MiniTest 5.19+ --- rubygem-nokogiri.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 7b3294f..b7073f0 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.15.3 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -109,6 +109,11 @@ sed -i \ gumbo-parser/src/Makefile \ -e 's|^\(CFLAGS.*=.*\)$|\1 -fPIC|' +# MiniTest 5.19+ +%if 0%{?fedora} >= 39 +grep -rl MiniTest nokogiri-*/test/ | xargs sed -i 's|MiniTest::|Minitest::|' +%endif + %build # Ummm... env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec @@ -271,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Aug 4 2023 Mamoru TASAKA - 1.15.3-3 +- Support MiniTest 5.19+ + * Fri Jul 21 2023 Fedora Release Engineering - 1.15.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1569bb6157ff2735b7397497f8ecb956560d486a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 6 Aug 2023 16:56:23 +0900 Subject: [PATCH 063/103] Prefer upstream patch for the previous change --- nokogiri-pr2938-minitest-5_19.patch | 62 +++++++++++++++++++++++++++++ rubygem-nokogiri.spec | 30 ++++++-------- 2 files changed, 75 insertions(+), 17 deletions(-) create mode 100644 nokogiri-pr2938-minitest-5_19.patch diff --git a/nokogiri-pr2938-minitest-5_19.patch b/nokogiri-pr2938-minitest-5_19.patch new file mode 100644 index 0000000..5622b55 --- /dev/null +++ b/nokogiri-pr2938-minitest-5_19.patch @@ -0,0 +1,62 @@ +From a29042b0c0dbdc1b488a97dd6d6dd88d4b583c05 Mon Sep 17 00:00:00 2001 +From: Mike Dalessio +Date: Thu, 3 Aug 2023 17:52:36 -0400 +Subject: [PATCH 2/3] style: prefer Minitest to MiniTest + +since Minitest 5.19 doesn't load it by default +--- + .github/ISSUE_TEMPLATE/1-bug-report.md | 2 +- + CONTRIBUTING.md | 2 +- + test/helper.rb | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md +index 297cd4de42..79d4bf6ff1 100644 +--- a/.github/ISSUE_TEMPLATE/1-bug-report.md ++++ b/.github/ISSUE_TEMPLATE/1-bug-report.md +@@ -32,7 +32,7 @@ Here's an example of how you might structure such a script: + require 'nokogiri' + require 'minitest/autorun' + +-class Test < MiniTest::Spec ++class Test < Minitest::Spec + describe "Node#css" do + it "should find a div using chained classes" do + html = <<~HEREDOC +diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md +index 336c9c5c14..a0f844d16e 100644 +--- a/CONTRIBUTING.md ++++ b/CONTRIBUTING.md +@@ -124,7 +124,7 @@ Note that `rake test` does not compile the native extension, and this is intenti + bundle exec rake compile test + ``` + +-To run a focused test, use MiniTest's `TESTOPTS`: ++To run a focused test, use Minitest's `TESTOPTS`: + + ``` sh + bundle exec rake compile test TESTOPTS="-n/test_last_element_child/" +diff --git a/test/helper.rb b/test/helper.rb +index ed3133c6e8..8d4569e87c 100644 +--- a/test/helper.rb ++++ b/test/helper.rb +@@ -128,7 +128,7 @@ class TestBenchmark < Minitest::BenchSpec + end + + # rubocop:disable Style/ClassVars +- class TestCase < MiniTest::Spec ++ class TestCase < Minitest::Spec + include TestBase + + COMPACT_EVERY = 20 +@@ -272,7 +272,7 @@ def assert_not_send(send_ary, m = nil) + def pending(msg) + begin + yield +- rescue MiniTest::Assertion ++ rescue Minitest::Assertion + skip("pending #{msg} [#{caller(2..2).first}]") + end + flunk("pending test unexpectedly passed: #{msg} [#{caller(1..1).first}]") + + diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index b7073f0..c4d445c 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.15.3 #%%global prever .rc4 -%global baserelease 3 +%global baserelease 4 %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 +# https://github.com/sparklemotion/nokogiri/pull/2938 +Patch1: %{gem_name}-pr2938-minitest-5_19.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -76,10 +78,12 @@ This package provides non-Gem support for %{gem_name}. %prep %setup -q -n %{gem_name}-%{version} -a 1 +cp -a %{gem_name}-%{version}/{.,*} . mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 +%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -109,11 +113,6 @@ sed -i \ gumbo-parser/src/Makefile \ -e 's|^\(CFLAGS.*=.*\)$|\1 -fPIC|' -# MiniTest 5.19+ -%if 0%{?fedora} >= 39 -grep -rl MiniTest nokogiri-*/test/ | xargs sed -i 's|MiniTest::|Minitest::|' -%endif - %build # Ummm... env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec @@ -170,7 +169,7 @@ do done # Copy document files from full source -cp -p %{gem_name}-%{version}/[A-Z]* %{buildroot}%{gem_instdir}/ +cp -p [A-Z]* %{buildroot}%{gem_instdir}/ # cleanups # Remove bundled gumbo parser @@ -186,10 +185,9 @@ rm -rf \ ports \ %{nil} pushd gumbo-parser -rm \ - Makefile \ - %{nil} -find src -type f | \ +find . -type f | \ + grep -v CHANGES.md | \ + grep -v THANKS | \ grep -v README.md | \ xargs rm -f @@ -205,7 +203,7 @@ export TZ="Asia/Tokyo" LANG=C.UTF-8 # Copy test files from full tarball -cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir} +cp -a test/ ./%{gem_instdir} pushd ./%{gem_instdir} # Remove unneeded simplecov coverage test @@ -220,11 +218,6 @@ sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb # PPC64LE with ruby3.1 does not seem to support GC.compact %ifarch ppc64le export NOKOGIRI_TEST_GC_LEVEL=major -# F36 ruby has not implemented runtime GC compaction support yet -# c.f https://src.fedoraproject.org/rpms/ruby/pull-request/126 -%if 0%{?fedora} <= 36 -sed -i test/test_compaction.rb -e 's|skip unless GC.respond_to.*|skip|' -%endif %endif %ifarch s390x # With ruby 3.2 GC_LEVEL=compact seems to cause segfault: @@ -276,6 +269,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Aug 6 2023 Mamoru TASAKA - 1.15.3-4 +- Prefer upstream patch for the previous change + * Fri Aug 4 2023 Mamoru TASAKA - 1.15.3-3 - Support MiniTest 5.19+ From 8820fad4b3e368c60c5cd255ce92b244133446ba Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 12 Aug 2023 14:20:32 +0900 Subject: [PATCH 064/103] 1.15.4 --- nokogiri-pr2938-minitest-5_19.patch | 62 ----------------------------- rubygem-nokogiri.spec | 10 ++--- sources | 4 +- 3 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 nokogiri-pr2938-minitest-5_19.patch diff --git a/nokogiri-pr2938-minitest-5_19.patch b/nokogiri-pr2938-minitest-5_19.patch deleted file mode 100644 index 5622b55..0000000 --- a/nokogiri-pr2938-minitest-5_19.patch +++ /dev/null @@ -1,62 +0,0 @@ -From a29042b0c0dbdc1b488a97dd6d6dd88d4b583c05 Mon Sep 17 00:00:00 2001 -From: Mike Dalessio -Date: Thu, 3 Aug 2023 17:52:36 -0400 -Subject: [PATCH 2/3] style: prefer Minitest to MiniTest - -since Minitest 5.19 doesn't load it by default ---- - .github/ISSUE_TEMPLATE/1-bug-report.md | 2 +- - CONTRIBUTING.md | 2 +- - test/helper.rb | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md -index 297cd4de42..79d4bf6ff1 100644 ---- a/.github/ISSUE_TEMPLATE/1-bug-report.md -+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md -@@ -32,7 +32,7 @@ Here's an example of how you might structure such a script: - require 'nokogiri' - require 'minitest/autorun' - --class Test < MiniTest::Spec -+class Test < Minitest::Spec - describe "Node#css" do - it "should find a div using chained classes" do - html = <<~HEREDOC -diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md -index 336c9c5c14..a0f844d16e 100644 ---- a/CONTRIBUTING.md -+++ b/CONTRIBUTING.md -@@ -124,7 +124,7 @@ Note that `rake test` does not compile the native extension, and this is intenti - bundle exec rake compile test - ``` - --To run a focused test, use MiniTest's `TESTOPTS`: -+To run a focused test, use Minitest's `TESTOPTS`: - - ``` sh - bundle exec rake compile test TESTOPTS="-n/test_last_element_child/" -diff --git a/test/helper.rb b/test/helper.rb -index ed3133c6e8..8d4569e87c 100644 ---- a/test/helper.rb -+++ b/test/helper.rb -@@ -128,7 +128,7 @@ class TestBenchmark < Minitest::BenchSpec - end - - # rubocop:disable Style/ClassVars -- class TestCase < MiniTest::Spec -+ class TestCase < Minitest::Spec - include TestBase - - COMPACT_EVERY = 20 -@@ -272,7 +272,7 @@ def assert_not_send(send_ary, m = nil) - def pending(msg) - begin - yield -- rescue MiniTest::Assertion -+ rescue Minitest::Assertion - skip("pending #{msg} [#{caller(2..2).first}]") - end - flunk("pending test unexpectedly passed: #{msg} [#{caller(1..1).first}]") - - diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index c4d445c..ab4c54c 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.15.3 +%global mainver 1.15.4 #%%global prever .rc4 -%global baserelease 4 +%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 -# https://github.com/sparklemotion/nokogiri/pull/2938 -Patch1: %{gem_name}-pr2938-minitest-5_19.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -83,7 +81,6 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 -%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -269,6 +266,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Aug 12 2023 Mamoru TASAKA - 1.15.4-1 +- 1.15.4 + * Sun Aug 6 2023 Mamoru TASAKA - 1.15.3-4 - Prefer upstream patch for the previous change diff --git a/sources b/sources index 452199e..dbd6165 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.15.3.gem) = d5159f0ce8eb43e5dd65138cb17519bd15caec36889fde3fcef53e64261172e69d3676c0119c5ab247e19d5f8e8f03c3bbde2285cd8d0974cbf8a4be5e30c58d -SHA512 (rubygem-nokogiri-1.15.3-full.tar.gz) = bf460d2d588b9aecc07611709192bc2b604df99ff235c20eb7c6dc18b0e72f0b992d41ee2a5cddc8b0c3f5f665072c936da285ec01b33e6e132588f1914ffaf8 +SHA512 (nokogiri-1.15.4.gem) = 94587e0f87a44dcbaef3dfd29df0fb7cba9458a36fd4a486432b2718e93afc712fefce2a3618ccef6bb96a6578daca043ecd5c02de8bca3206b801cda1403c4c +SHA512 (rubygem-nokogiri-1.15.4-full.tar.gz) = 6655e2560a2d39f95859838fb6d8d0d5dcb74f5bf82cd06f183a39e94294df0eab4070ecc7f4a9002508e5f5171c6de7f692a5e0c3d83a79718b58b64f0462dd From ea58e84d092cdbd3f989ce284ef44118420dd646 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 18 Nov 2023 22:50:51 +0900 Subject: [PATCH 065/103] 1.15.5 Backport upstream patch for libxml2 2.12.0 error handling change --- ...2973-libxml2-2_12_0-error-msg-change.patch | 42 +++++++++++++++++++ ...-libxml2-2_12_0-recovery-char-change.patch | 37 ++++++++++++++++ rubygem-nokogiri.spec | 12 +++++- sources | 4 +- 4 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch create mode 100644 nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch diff --git a/nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch b/nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch new file mode 100644 index 0000000..94e1345 --- /dev/null +++ b/nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch @@ -0,0 +1,42 @@ +From 374f3281a67ab3a3e52ebe6deacc0548b3f1b96a Mon Sep 17 00:00:00 2001 +From: Mike Dalessio +Date: Mon, 4 Sep 2023 12:58:45 -0400 +Subject: [PATCH] test: update to handle upstream libxml2 error changes + +The behavior changed in libxml2 commit 53050b1d +--- + test/xml/test_reader.rb | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/test/xml/test_reader.rb b/test/xml/test_reader.rb +index 4b5b5c5728..e5f01d32ec 100644 +--- a/test/xml/test_reader.rb ++++ b/test/xml/test_reader.rb +@@ -765,7 +765,12 @@ def test_broken_markup_attribute_hash + e = assert_raises(Nokogiri::XML::SyntaxError) do + reader.attribute_hash + end +- assert_includes(e.message, "FATAL: Extra content at the end of the document") ++ expected = if Nokogiri.uses_libxml?(">= 2.12.0") # upstream commit 53050b1d ++ "FATAL: Premature end of data in tag foo line 1" ++ else ++ "FATAL: Extra content at the end of the document" ++ end ++ assert_includes(e.message, expected) + end + + assert_equal(1, reader.errors.length) +@@ -796,7 +801,12 @@ def test_broken_markup_namespaces + e = assert_raises(Nokogiri::XML::SyntaxError) do + reader.namespaces + end +- assert_includes(e.message, "FATAL: Extra content at the end of the document") ++ expected = if Nokogiri.uses_libxml?(">= 2.12.0") # upstream commit 53050b1d ++ "FATAL: Premature end of data in tag foo line 1" ++ else ++ "FATAL: Extra content at the end of the document" ++ end ++ assert_includes(e.message, expected) + end + + assert_equal(1, reader.errors.length) diff --git a/nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch b/nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch new file mode 100644 index 0000000..f6e84d8 --- /dev/null +++ b/nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch @@ -0,0 +1,37 @@ +From 5e60c08c6ec75ec8767f3edbfcba0d8e39d06495 Mon Sep 17 00:00:00 2001 +From: Mike Dalessio +Date: Tue, 24 Oct 2023 08:54:19 -0400 +Subject: [PATCH] fix: work around change in upstream libxml2 recovery + +See: + +- https://gitlab.gnome.org/GNOME/libxml2/-/issues/598 +- https://gitlab.gnome.org/GNOME/libxml2/-/commit/c082ef4644ce1f0af2a7c01e27c4a75f4d7d4feb +--- + test/xml/sax/test_push_parser.rb | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/test/xml/sax/test_push_parser.rb b/test/xml/sax/test_push_parser.rb +index 5c9ddd3840..aa7ce84e8e 100644 +--- a/test/xml/sax/test_push_parser.rb ++++ b/test/xml/sax/test_push_parser.rb +@@ -182,12 +182,18 @@ def error(msg) + + it :test_broken_encoding do + skip_unless_libxml2("ultra hard to fix for pure Java version") ++ + parser.options |= Nokogiri::XML::ParseOptions::RECOVER + # This is ISO_8859-1: + parser << "Gau\337" + parser.finish ++ + assert(parser.document.errors.size >= 1) +- assert_equal "Gau\337", parser.document.data.join ++ ++ # the interpretation of the byte may vary by libxml2 version in recovery mode ++ # see for example https://gitlab.gnome.org/GNOME/libxml2/-/issues/598 ++ assert(parser.document.data.join.start_with?("Gau")) ++ + assert_equal [["r"]], parser.document.end_elements + end + diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index ab4c54c..bd16ba0 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.15.4 +%global mainver 1.15.5 #%%global prever .rc4 %global baserelease 1 @@ -29,6 +29,10 @@ 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 +# https://github.com/sparklemotion/nokogiri/pull/2973 +Patch1: nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch +# https://github.com/sparklemotion/nokogiri/pull/3013 +Patch2: nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -81,6 +85,8 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 # remove bundled external libraries sed -i \ @@ -266,6 +272,10 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Nov 18 2023 Mamoru TASAKA - 1.15.5-1 +- 1.15.5 +- Backport upstream patch for libxml2 2.12.0 error handling change + * Sat Aug 12 2023 Mamoru TASAKA - 1.15.4-1 - 1.15.4 diff --git a/sources b/sources index dbd6165..04feeac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.15.4.gem) = 94587e0f87a44dcbaef3dfd29df0fb7cba9458a36fd4a486432b2718e93afc712fefce2a3618ccef6bb96a6578daca043ecd5c02de8bca3206b801cda1403c4c -SHA512 (rubygem-nokogiri-1.15.4-full.tar.gz) = 6655e2560a2d39f95859838fb6d8d0d5dcb74f5bf82cd06f183a39e94294df0eab4070ecc7f4a9002508e5f5171c6de7f692a5e0c3d83a79718b58b64f0462dd +SHA512 (nokogiri-1.15.5.gem) = 3f6c2febbdef2cc7e34b5555479b614165a4b3aaa8b46340812e2a736b3efd12c0d0e79c64ad2313a3d99326fd802eaab74eeda08c4ccd9a949974df69e0fe0f +SHA512 (rubygem-nokogiri-1.15.5-full.tar.gz) = 606b8fcc3483d4d834dc4cd9df73e56dbba6ad2c5c26223072f38f5e59b6746d913b73d9e3a6ffd4c5e52d5311c4efb0a78d3adae4545d6efdf826e4ab6a6985 From dd5ce8edc949bcaa67f68100ba86234c8f7197aa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Dec 2023 15:33:20 +0900 Subject: [PATCH 066/103] 1.16.0 --- ...2973-libxml2-2_12_0-error-msg-change.patch | 42 ------------------- ...-libxml2-2_12_0-recovery-char-change.patch | 37 ---------------- rubygem-nokogiri.spec | 13 +++--- sources | 4 +- 4 files changed, 7 insertions(+), 89 deletions(-) delete mode 100644 nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch delete mode 100644 nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch diff --git a/nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch b/nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch deleted file mode 100644 index 94e1345..0000000 --- a/nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 374f3281a67ab3a3e52ebe6deacc0548b3f1b96a Mon Sep 17 00:00:00 2001 -From: Mike Dalessio -Date: Mon, 4 Sep 2023 12:58:45 -0400 -Subject: [PATCH] test: update to handle upstream libxml2 error changes - -The behavior changed in libxml2 commit 53050b1d ---- - test/xml/test_reader.rb | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/test/xml/test_reader.rb b/test/xml/test_reader.rb -index 4b5b5c5728..e5f01d32ec 100644 ---- a/test/xml/test_reader.rb -+++ b/test/xml/test_reader.rb -@@ -765,7 +765,12 @@ def test_broken_markup_attribute_hash - e = assert_raises(Nokogiri::XML::SyntaxError) do - reader.attribute_hash - end -- assert_includes(e.message, "FATAL: Extra content at the end of the document") -+ expected = if Nokogiri.uses_libxml?(">= 2.12.0") # upstream commit 53050b1d -+ "FATAL: Premature end of data in tag foo line 1" -+ else -+ "FATAL: Extra content at the end of the document" -+ end -+ assert_includes(e.message, expected) - end - - assert_equal(1, reader.errors.length) -@@ -796,7 +801,12 @@ def test_broken_markup_namespaces - e = assert_raises(Nokogiri::XML::SyntaxError) do - reader.namespaces - end -- assert_includes(e.message, "FATAL: Extra content at the end of the document") -+ expected = if Nokogiri.uses_libxml?(">= 2.12.0") # upstream commit 53050b1d -+ "FATAL: Premature end of data in tag foo line 1" -+ else -+ "FATAL: Extra content at the end of the document" -+ end -+ assert_includes(e.message, expected) - end - - assert_equal(1, reader.errors.length) diff --git a/nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch b/nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch deleted file mode 100644 index f6e84d8..0000000 --- a/nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5e60c08c6ec75ec8767f3edbfcba0d8e39d06495 Mon Sep 17 00:00:00 2001 -From: Mike Dalessio -Date: Tue, 24 Oct 2023 08:54:19 -0400 -Subject: [PATCH] fix: work around change in upstream libxml2 recovery - -See: - -- https://gitlab.gnome.org/GNOME/libxml2/-/issues/598 -- https://gitlab.gnome.org/GNOME/libxml2/-/commit/c082ef4644ce1f0af2a7c01e27c4a75f4d7d4feb ---- - test/xml/sax/test_push_parser.rb | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/test/xml/sax/test_push_parser.rb b/test/xml/sax/test_push_parser.rb -index 5c9ddd3840..aa7ce84e8e 100644 ---- a/test/xml/sax/test_push_parser.rb -+++ b/test/xml/sax/test_push_parser.rb -@@ -182,12 +182,18 @@ def error(msg) - - it :test_broken_encoding do - skip_unless_libxml2("ultra hard to fix for pure Java version") -+ - parser.options |= Nokogiri::XML::ParseOptions::RECOVER - # This is ISO_8859-1: - parser << "Gau\337" - parser.finish -+ - assert(parser.document.errors.size >= 1) -- assert_equal "Gau\337", parser.document.data.join -+ -+ # the interpretation of the byte may vary by libxml2 version in recovery mode -+ # see for example https://gitlab.gnome.org/GNOME/libxml2/-/issues/598 -+ assert(parser.document.data.join.start_with?("Gau")) -+ - assert_equal [["r"]], parser.document.end_elements - end - diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index bd16ba0..700f961 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.15.5 +%global mainver 1.16.0 #%%global prever .rc4 %global baserelease 1 @@ -29,10 +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 -# https://github.com/sparklemotion/nokogiri/pull/2973 -Patch1: nokogiri-pr2973-libxml2-2_12_0-error-msg-change.patch -# https://github.com/sparklemotion/nokogiri/pull/3013 -Patch2: nokogiri-pr3013-libxml2-2_12_0-recovery-char-change.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -85,8 +81,6 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 # remove bundled external libraries sed -i \ @@ -211,7 +205,7 @@ pushd ./%{gem_instdir} # Remove unneeded simplecov coverage test sed -i test/helper.rb \ - -e '\@require.*simplecov@,\@^end$@s|^|#|' + -e '\@^ require.*simplecov@,\@^ end$@s|^|#|' # Remove minitest-reporters. It does not provide any additional value while # it blows up the dependency chain. @@ -272,6 +266,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Dec 29 2023 Mamoru TASAKA - 1.16.0-1 +- 1.16.0 + * Sat Nov 18 2023 Mamoru TASAKA - 1.15.5-1 - 1.15.5 - Backport upstream patch for libxml2 2.12.0 error handling change diff --git a/sources b/sources index 04feeac..3e31dd0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.15.5.gem) = 3f6c2febbdef2cc7e34b5555479b614165a4b3aaa8b46340812e2a736b3efd12c0d0e79c64ad2313a3d99326fd802eaab74eeda08c4ccd9a949974df69e0fe0f -SHA512 (rubygem-nokogiri-1.15.5-full.tar.gz) = 606b8fcc3483d4d834dc4cd9df73e56dbba6ad2c5c26223072f38f5e59b6746d913b73d9e3a6ffd4c5e52d5311c4efb0a78d3adae4545d6efdf826e4ab6a6985 +SHA512 (nokogiri-1.16.0.gem) = 4fdb498f285822f518eb7c89ef2e674f4d2f78d10dec92002c60528b87a27edc440bee9e21360ca2a1c8691785b43e6d453b8d7c319f87d019789d7c599880df +SHA512 (rubygem-nokogiri-1.16.0-full.tar.gz) = 0343e051c2694934db2b2e869887679e61dbb64dcb0d6e5dc83be25e5ea4e0d5637fb59e5d2ece58cd16e6ffb514d2b5c8bb6337eb89fc05398622572fc446e5 From 994a85659bd91d56b088984e3af6b8664f0ddfbe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2024 19:57:47 +0900 Subject: [PATCH 067/103] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 700f961..5a146a1 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.16.0 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -266,6 +266,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jan 03 2024 Mamoru TASAKA - 1.16.0-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + * Fri Dec 29 2023 Mamoru TASAKA - 1.16.0-1 - 1.16.0 From b0d89532e18af4a2778b06d813f982685e11f533 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:13:06 +0000 Subject: [PATCH 068/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 5a146a1..c8260ca 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.16.0 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -266,6 +266,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1.16.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 03 2024 Mamoru TASAKA - 1.16.0-2 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 From 58311a1e0b92c35c08aa4198e3394f6a93f616a1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 4 Feb 2024 15:50:01 +0900 Subject: [PATCH 069/103] 1.16.1 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index c8260ca..4e88ec8 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.16.0 +%global mainver 1.16.1 #%%global prever .rc4 -%global baserelease 3 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -266,6 +266,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Feb 04 2024 Mamoru TASAKA - 1.16.1-1 +- 1.16.1 + * Fri Jan 26 2024 Fedora Release Engineering - 1.16.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 3e31dd0..3b5b0fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.0.gem) = 4fdb498f285822f518eb7c89ef2e674f4d2f78d10dec92002c60528b87a27edc440bee9e21360ca2a1c8691785b43e6d453b8d7c319f87d019789d7c599880df -SHA512 (rubygem-nokogiri-1.16.0-full.tar.gz) = 0343e051c2694934db2b2e869887679e61dbb64dcb0d6e5dc83be25e5ea4e0d5637fb59e5d2ece58cd16e6ffb514d2b5c8bb6337eb89fc05398622572fc446e5 +SHA512 (nokogiri-1.16.1.gem) = 57f1c4e7ffdd038a689f1f41a04f1091f753e3e132c7c4c03703db2c930cec6feefa3e5b61fc88d020129b92ee09930eae614063ee8e42278db0ae044c402af4 +SHA512 (rubygem-nokogiri-1.16.1-full.tar.gz) = 3ed9e9a21f59592296fd9688898de32ce2c2a39122ab2fd6d8ffe0a91eb5ea20e0e5938452001907e947ed0d09c8ef3098098b5de7e0c4021ad7b473afadd2c9 From 517a475ee6934c43fec10713d63faec1d1d507b2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 5 Feb 2024 09:10:01 +0900 Subject: [PATCH 070/103] 1.16.2 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 4e88ec8..8112546 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.16.1 +%global mainver 1.16.2 #%%global prever .rc4 %global baserelease 1 @@ -266,6 +266,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Feb 05 2024 Mamoru TASAKA - 1.16.2-1 +- 1.16.2 + * Sun Feb 04 2024 Mamoru TASAKA - 1.16.1-1 - 1.16.1 diff --git a/sources b/sources index 3b5b0fa..d4db8b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.1.gem) = 57f1c4e7ffdd038a689f1f41a04f1091f753e3e132c7c4c03703db2c930cec6feefa3e5b61fc88d020129b92ee09930eae614063ee8e42278db0ae044c402af4 -SHA512 (rubygem-nokogiri-1.16.1-full.tar.gz) = 3ed9e9a21f59592296fd9688898de32ce2c2a39122ab2fd6d8ffe0a91eb5ea20e0e5938452001907e947ed0d09c8ef3098098b5de7e0c4021ad7b473afadd2c9 +SHA512 (nokogiri-1.16.2.gem) = 4a973610855ef9ac5cced69cd43cf723273f23dbf14586021ffaa8787b0c54fb3d63f94239636166bdeb8668d6e67d269899ebc1ad0a232d95389aeee8dad642 +SHA512 (rubygem-nokogiri-1.16.2-full.tar.gz) = 382ff45015091904dac41b771b658a0a7c8a9288b79b08034062339ba7b6f740b673f21b46e0c774df32bdf2023a3148b56438838b101054d7902a40a244a601 From bec33a2666c3a1af156b0802227ef5a65e2d007a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Mar 2024 19:39:50 +0900 Subject: [PATCH 071/103] 1.16.3 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 8112546..28ae0d8 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.16.2 +%global mainver 1.16.3 #%%global prever .rc4 %global baserelease 1 @@ -266,6 +266,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Mar 17 2024 Mamoru TASAKA - 1.16.3-1 +- 1.16.3 + * Mon Feb 05 2024 Mamoru TASAKA - 1.16.2-1 - 1.16.2 diff --git a/sources b/sources index d4db8b3..2806fd4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.2.gem) = 4a973610855ef9ac5cced69cd43cf723273f23dbf14586021ffaa8787b0c54fb3d63f94239636166bdeb8668d6e67d269899ebc1ad0a232d95389aeee8dad642 -SHA512 (rubygem-nokogiri-1.16.2-full.tar.gz) = 382ff45015091904dac41b771b658a0a7c8a9288b79b08034062339ba7b6f740b673f21b46e0c774df32bdf2023a3148b56438838b101054d7902a40a244a601 +SHA512 (nokogiri-1.16.3.gem) = 5e3ff268fed58e4e0c771de4661cc5efb68296b9af611440b373c64564343e4917e3b4e031385bfb6e4fcadb64502287b0f040f8554f55e64e13e99595ba7249 +SHA512 (rubygem-nokogiri-1.16.3-full.tar.gz) = 1cf42e70051833eeb38b438fc6df8d35a0590a3a7c4a567e669a5ebcedb311a77843dcdf7c9ebf1b47e714777482b7763dab9aff0e27bf1ea551629a241bf100 From 4189454b54903d73c100838aad48afe50db0c0ae Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 11 Apr 2024 16:31:17 +0900 Subject: [PATCH 072/103] 1.16.4 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 28ae0d8..dd55f66 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.16.3 +%global mainver 1.16.4 #%%global prever .rc4 %global baserelease 1 @@ -266,6 +266,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Apr 11 2024 Mamoru TASAKA - 1.16.4-1 +- 1.16.4 + * Sun Mar 17 2024 Mamoru TASAKA - 1.16.3-1 - 1.16.3 diff --git a/sources b/sources index 2806fd4..90ec85d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.3.gem) = 5e3ff268fed58e4e0c771de4661cc5efb68296b9af611440b373c64564343e4917e3b4e031385bfb6e4fcadb64502287b0f040f8554f55e64e13e99595ba7249 -SHA512 (rubygem-nokogiri-1.16.3-full.tar.gz) = 1cf42e70051833eeb38b438fc6df8d35a0590a3a7c4a567e669a5ebcedb311a77843dcdf7c9ebf1b47e714777482b7763dab9aff0e27bf1ea551629a241bf100 +SHA512 (nokogiri-1.16.4.gem) = c9e1c7c2a8cd087f88efe8421437ebd3d79f99a8be058c6b877ddcf70cb039c593605618b3381a2854b43551cc102cd6e8a9163fcc941bee65cc671ea463201c +SHA512 (rubygem-nokogiri-1.16.4-full.tar.gz) = e10b11f538d3c4850b4fb10620e4497918be8e60d05558b9fcedf96f382d08fe6b0dfe65a69a346855888c2ee68e71cb019eadc0aff044aeff9a51752b5b0805 From 1f79b238fa9185df2f4ea3dc891be537b94a7d1c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 25 Apr 2024 15:06:32 +0900 Subject: [PATCH 073/103] Make rubygem-minizip testsuite dependency optional, drop on RHEL (Patch by Jun Aruga ) --- ...nokogiri-pr3177-rubyzip-dep-optional.patch | 31 +++++++++++++++++++ rubygem-nokogiri.spec | 14 ++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch diff --git a/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch b/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch new file mode 100644 index 0000000..c7b2b1c --- /dev/null +++ b/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch @@ -0,0 +1,31 @@ +From 26e5ba521208706ae68f19062d4ad24ad257aa47 Mon Sep 17 00:00:00 2001 +From: Jun Aruga +Date: Mon, 15 Apr 2024 15:46:30 +0200 +Subject: [PATCH] Make a test depending on the rubyzip gem optional. + +Because I still want to pass the nokogiri's unit tests in a downstream nokogiri +package on a Linux distro such as CentOS 10 Stream and RHEL 10, where we don't +want to manage the rubyzip gem[1]. + +[1] https://rubygems.org/gems/rubyzip +--- + test/xml/test_document_encoding.rb | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/test/xml/test_document_encoding.rb b/test/xml/test_document_encoding.rb +index cd8b1b4da2..c0cb93b283 100644 +--- a/test/xml/test_document_encoding.rb ++++ b/test/xml/test_document_encoding.rb +@@ -91,7 +91,11 @@ class TestDocumentEncoding < Nokogiri::TestCase + describe "pseudo-IO" do + it "serializes correctly with Zip::OutputStream objects" do + # https://github.com/sparklemotion/nokogiri/issues/2773 +- require "zip" ++ begin ++ require "zip" ++ rescue LoadError ++ skip("rubyzip is not installed") ++ end + + xml = <<~XML + diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index dd55f66..b07580f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.16.4 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -29,12 +29,19 @@ 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 +# https://github.com/sparklemotion/nokogiri/pull/3177 +# Make rubygem-minizip dependency optional +Patch1: %{name}-pr3177-rubyzip-dep-optional.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## ## For %%check BuildRequires: rubygem(minitest) +%if !0%{?rhel} +# For test/xml/test_document_encoding.rb +# Drop rubygem(rubyzip) build dependency in RHEL BuildRequires: rubygem(rubyzip) +%endif BuildRequires: rubygems-devel Obsoletes: ruby-%{gem_name} <= 1.5.2-2 #BuildRequires: ruby(racc) @@ -81,6 +88,7 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 +%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -266,6 +274,10 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Apr 25 2024 Mamoru TASAKA - 1.16.4-2 +- Make rubygem-minizip testsuite dependency optional, drop on RHEL + (Patch by Jun Aruga ) + * Thu Apr 11 2024 Mamoru TASAKA - 1.16.4-1 - 1.16.4 From d32eeeb9c170a5d02daa246bedff6466fd4812ef Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Fri, 26 Apr 2024 14:28:40 +0200 Subject: [PATCH 074/103] Fix the directory of patches for libraries nokogiri bundles. --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index b07580f..fba4a6d 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -93,7 +93,7 @@ mv ../%{gem_name}-%{version}.gemspec . # remove bundled external libraries sed -i \ -e 's|, "ports/archives/[^"][^"]*"||g' \ - -e 's|, "ports/patches/[^"][^"]*"||g' \ + -e 's|, "patches/[^"][^"]*"||g' \ %{gem_name}-%{version}.gemspec # Actually not needed when using system libraries sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec From f8321206b1733fe6a4484b4726d681414b44b6a7 Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Fri, 26 Apr 2024 14:29:12 +0200 Subject: [PATCH 075/103] Delete the bundled libraries that are replaced with system libraries. --- rubygem-nokogiri.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index fba4a6d..d6eec47 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -95,6 +95,9 @@ sed -i \ -e 's|, "ports/archives/[^"][^"]*"||g' \ -e 's|, "patches/[^"][^"]*"||g' \ %{gem_name}-%{version}.gemspec +# Make sure gem build will complain later if the previous regex is not enough. +rm -rf ports patches + # Actually not needed when using system libraries sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec From 4cfee13a9876edd4cc389f0dd62671687a48246d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 29 Apr 2024 23:20:58 +0900 Subject: [PATCH 076/103] cosmetic style change --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index d6eec47..4e44398 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -96,7 +96,10 @@ sed -i \ -e 's|, "patches/[^"][^"]*"||g' \ %{gem_name}-%{version}.gemspec # Make sure gem build will complain later if the previous regex is not enough. -rm -rf ports patches +rm -rf \ + ports \ + patches \ + %{nil} # Actually not needed when using system libraries sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec From 3ce271725f415c750ecd8c01f663331b69de48ed Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 May 2024 17:09:15 +0900 Subject: [PATCH 077/103] 1.16.5 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 4e44398..6314513 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.16.4 +%global mainver 1.16.5 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -280,6 +280,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue May 14 2024 Mamoru TASAKA - 1.16.5-1 +- 1.16.5 + * Thu Apr 25 2024 Mamoru TASAKA - 1.16.4-2 - Make rubygem-minizip testsuite dependency optional, drop on RHEL (Patch by Jun Aruga ) diff --git a/sources b/sources index 90ec85d..e669e5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.4.gem) = c9e1c7c2a8cd087f88efe8421437ebd3d79f99a8be058c6b877ddcf70cb039c593605618b3381a2854b43551cc102cd6e8a9163fcc941bee65cc671ea463201c -SHA512 (rubygem-nokogiri-1.16.4-full.tar.gz) = e10b11f538d3c4850b4fb10620e4497918be8e60d05558b9fcedf96f382d08fe6b0dfe65a69a346855888c2ee68e71cb019eadc0aff044aeff9a51752b5b0805 +SHA512 (nokogiri-1.16.5.gem) = d8c5c356efcca57672264c3f8c1e485de1e9ccef1313c4dca11df1f174208ffe854adc49f3b2420ab9cc4b2dfc1a5877571f29e0c997d79c92e6ecdd1ea4cdba +SHA512 (rubygem-nokogiri-1.16.5-full.tar.gz) = 73d8fde3a3f5f34ca55d4f48f16dec64fa70f5e4e61be0ef1cfe746c5c1097bf23c8c36ecd58f65a26727653286a953ccdd2b328cf63812571a030fc0f6d5491 From 407114357bc18a35fe9e4de2b026bb5bf6b496f8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 16 Jun 2024 16:05:35 +0900 Subject: [PATCH 078/103] 1.16.6 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 6314513..cc667bd 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.16.5 +%global mainver 1.16.6 #%%global prever .rc4 %global baserelease 1 @@ -280,6 +280,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Jun 16 2024 Mamoru TASAKA - 1.16.6-1 +- 1.16.6 + * Tue May 14 2024 Mamoru TASAKA - 1.16.5-1 - 1.16.5 diff --git a/sources b/sources index e669e5b..abfee3d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.5.gem) = d8c5c356efcca57672264c3f8c1e485de1e9ccef1313c4dca11df1f174208ffe854adc49f3b2420ab9cc4b2dfc1a5877571f29e0c997d79c92e6ecdd1ea4cdba -SHA512 (rubygem-nokogiri-1.16.5-full.tar.gz) = 73d8fde3a3f5f34ca55d4f48f16dec64fa70f5e4e61be0ef1cfe746c5c1097bf23c8c36ecd58f65a26727653286a953ccdd2b328cf63812571a030fc0f6d5491 +SHA512 (rubygem-nokogiri-1.16.6-full.tar.gz) = ed407d2410eafa38c4c248010df4dce4f6e728c2248508ac59fd772e3076952937ba20b6267afa2aaa1f928e85fd5f93cad90cdac9070cb2332376e84743d02a +SHA512 (nokogiri-1.16.6.gem) = 9e03163efbc55a9649b8026a1490dfb67276eb3334162fd7ade0f4195016d704e91419bbac1ba45fa89fb0d6591e549255babfff11de44b40a60278b9338b48c From dc2d2dd961f44d5e3fe492c519ebd7a476cea1a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:41:11 +0000 Subject: [PATCH 079/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index cc667bd..d8723c2 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.16.6 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -280,6 +280,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.16.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 16 2024 Mamoru TASAKA - 1.16.6-1 - 1.16.6 From 5bad2aee539742271597065f2c1943a8db96e8da Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 31 Jul 2024 16:20:34 +0900 Subject: [PATCH 080/103] 1.16.7 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index d8723c2..8517769 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.16.6 +%global mainver 1.16.7 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -280,6 +280,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jul 31 2024 Mamoru TASAKA - 1.16.7-1 +- 1.16.7 + * Fri Jul 19 2024 Fedora Release Engineering - 1.16.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index abfee3d..8f57de9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-nokogiri-1.16.6-full.tar.gz) = ed407d2410eafa38c4c248010df4dce4f6e728c2248508ac59fd772e3076952937ba20b6267afa2aaa1f928e85fd5f93cad90cdac9070cb2332376e84743d02a -SHA512 (nokogiri-1.16.6.gem) = 9e03163efbc55a9649b8026a1490dfb67276eb3334162fd7ade0f4195016d704e91419bbac1ba45fa89fb0d6591e549255babfff11de44b40a60278b9338b48c +SHA512 (nokogiri-1.16.7.gem) = 52cf1d414ca47b532eb3824423f03d3c4d510ca3472b4a77125d85b5dad44f11e3058b20912864d43d9b48162a0ec2c88e7f4104d2dca7e192b5b2d01aa6fc9d +SHA512 (rubygem-nokogiri-1.16.7-full.tar.gz) = 786d519017d8f4b11c248c44687e668d80e85c28d6e7fd60c213d5453f14c5b9eef3d7c5e9b9ccad1d6c6639424610d5249031a64bbd37ba8128a1f249e8dcec From e4564a6c589387c267bdd4b90d8cd7929d601739 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Dec 2024 20:00:24 +0900 Subject: [PATCH 081/103] 1.16.8 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 8517769..8bbb785 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.16.7 +%global mainver 1.16.8 #%%global prever .rc4 %global baserelease 1 @@ -280,6 +280,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Dec 05 2024 Mamoru TASAKA - 1.16.8-1 +- 1.16.8 + * Wed Jul 31 2024 Mamoru TASAKA - 1.16.7-1 - 1.16.7 diff --git a/sources b/sources index 8f57de9..9424b65 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.7.gem) = 52cf1d414ca47b532eb3824423f03d3c4d510ca3472b4a77125d85b5dad44f11e3058b20912864d43d9b48162a0ec2c88e7f4104d2dca7e192b5b2d01aa6fc9d -SHA512 (rubygem-nokogiri-1.16.7-full.tar.gz) = 786d519017d8f4b11c248c44687e668d80e85c28d6e7fd60c213d5453f14c5b9eef3d7c5e9b9ccad1d6c6639424610d5249031a64bbd37ba8128a1f249e8dcec +SHA512 (nokogiri-1.16.8.gem) = 5dfcdc303dc1a6955f9e3831ca15ea76dad385e10df7d18b2d0b363498206f5fd1b7c24b2849a0199b311e174b8b77c18059b503e6c33e6cae43fffc4d9b0382 +SHA512 (rubygem-nokogiri-1.16.8-full.tar.gz) = 2737ac2b0f0283719803a7471edd3aebc4b3ef230bc22f77de7e764c360d8bf099ab3d807787df1254688cc9cec4727655f86bea508986ca8f5d665f3e32887e From ef798a222d706c8c02f975d54100aa22f1d94133 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 9 Dec 2024 23:13:40 +0900 Subject: [PATCH 082/103] 1.17.0 --- ...nokogiri-pr3177-rubyzip-dep-optional.patch | 31 ------------------- rubygem-nokogiri.spec | 11 +++---- sources | 4 +-- 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch diff --git a/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch b/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch deleted file mode 100644 index c7b2b1c..0000000 --- a/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 26e5ba521208706ae68f19062d4ad24ad257aa47 Mon Sep 17 00:00:00 2001 -From: Jun Aruga -Date: Mon, 15 Apr 2024 15:46:30 +0200 -Subject: [PATCH] Make a test depending on the rubyzip gem optional. - -Because I still want to pass the nokogiri's unit tests in a downstream nokogiri -package on a Linux distro such as CentOS 10 Stream and RHEL 10, where we don't -want to manage the rubyzip gem[1]. - -[1] https://rubygems.org/gems/rubyzip ---- - test/xml/test_document_encoding.rb | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/test/xml/test_document_encoding.rb b/test/xml/test_document_encoding.rb -index cd8b1b4da2..c0cb93b283 100644 ---- a/test/xml/test_document_encoding.rb -+++ b/test/xml/test_document_encoding.rb -@@ -91,7 +91,11 @@ class TestDocumentEncoding < Nokogiri::TestCase - describe "pseudo-IO" do - it "serializes correctly with Zip::OutputStream objects" do - # https://github.com/sparklemotion/nokogiri/issues/2773 -- require "zip" -+ begin -+ require "zip" -+ rescue LoadError -+ skip("rubyzip is not installed") -+ end - - xml = <<~XML - diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 8bbb785..10d3c57 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.16.8 +%global mainver 1.17.0 #%%global prever .rc4 %global baserelease 1 @@ -29,9 +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 -# https://github.com/sparklemotion/nokogiri/pull/3177 -# Make rubygem-minizip dependency optional -Patch1: %{name}-pr3177-rubyzip-dep-optional.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -88,7 +85,6 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 -%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -109,7 +105,7 @@ sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec sed -i \ ext/nokogiri/extconf.rb \ -e "s@^\(def process_recipe.*\)\$@\1 ; return true@" \ - -e "s@^\(append_cppflags\).*gumbo.*\$@\1(\"-I$(pwd)/gumbo-parser/src\")@" \ + -e "s@^\([ \t]*append_cppflags\).*gumbo.*\$@\1(\"-I$(pwd)/gumbo-parser/src\")@" \ -e "\@libs.*gumbo@s@File\.join.*@\"$(pwd)/gumbo-parser/src/libgumbo.a\"@" \ -e "\@LIBPATH.*gumbo@s|^\(.*\)\$|# \1|" \ %{nil} @@ -280,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Dec 09 2024 Mamoru TASAKA - 1.17.0-1 +- 1.17.0 + * Thu Dec 05 2024 Mamoru TASAKA - 1.16.8-1 - 1.16.8 diff --git a/sources b/sources index 9424b65..a5d6c38 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.8.gem) = 5dfcdc303dc1a6955f9e3831ca15ea76dad385e10df7d18b2d0b363498206f5fd1b7c24b2849a0199b311e174b8b77c18059b503e6c33e6cae43fffc4d9b0382 -SHA512 (rubygem-nokogiri-1.16.8-full.tar.gz) = 2737ac2b0f0283719803a7471edd3aebc4b3ef230bc22f77de7e764c360d8bf099ab3d807787df1254688cc9cec4727655f86bea508986ca8f5d665f3e32887e +SHA512 (nokogiri-1.17.0.gem) = e935aa635407d8c91586e65e09a020046726d44af99d9afbf0d3c6088734997bca40a98998bf5889631fd8508e96e4dd11eeca19d371bfe11c45ef7598a667f6 +SHA512 (rubygem-nokogiri-1.17.0-full.tar.gz) = 322b91bc4ad81eb23f3dbe6018db9110650b6d38c2077b051b280652443cf3336bcc3d28766336156b4fe245ca9a3d420e7f913cb9c06b3773a40f043cb87b87 From d0b3530cf5b1e3091282c1017865f9c622dc2c5f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 11 Dec 2024 17:42:48 +0900 Subject: [PATCH 083/103] 1.17.1 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 10d3c57..0b7647a 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.17.0 +%global mainver 1.17.1 #%%global prever .rc4 %global baserelease 1 @@ -276,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Dec 11 2024 Mamoru TASAKA - 1.17.1-1 +- 1.17.1 + * Mon Dec 09 2024 Mamoru TASAKA - 1.17.0-1 - 1.17.0 diff --git a/sources b/sources index a5d6c38..543d339 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.17.0.gem) = e935aa635407d8c91586e65e09a020046726d44af99d9afbf0d3c6088734997bca40a98998bf5889631fd8508e96e4dd11eeca19d371bfe11c45ef7598a667f6 -SHA512 (rubygem-nokogiri-1.17.0-full.tar.gz) = 322b91bc4ad81eb23f3dbe6018db9110650b6d38c2077b051b280652443cf3336bcc3d28766336156b4fe245ca9a3d420e7f913cb9c06b3773a40f043cb87b87 +SHA512 (nokogiri-1.17.1.gem) = 78fd03661569b123fe413a37b4918db8c0c3db4b0fe5374569fa424140be7cf933984f55ec458ee88eb50c116f6a23ae3cac94df1f1b34a1e49f14377c0c8d2e +SHA512 (rubygem-nokogiri-1.17.1-full.tar.gz) = a795f18e8fc756f53e5a205f13c7bd0fbc83f3c8fa1e20c43af9ba4a0400bb9a28dd9fb85f710c17b659b5471e88500c6248716756f3a9e22e253026a14411f6 From 941cbb1036f0cb01437ed79c838e4cccd0c190f1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 13 Dec 2024 11:33:53 +0900 Subject: [PATCH 084/103] 1.17.2 --- nokogiri-create-full-tarball.sh | 5 ++++- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nokogiri-create-full-tarball.sh b/nokogiri-create-full-tarball.sh index d6fbd01..a204942 100644 --- a/nokogiri-create-full-tarball.sh +++ b/nokogiri-create-full-tarball.sh @@ -20,7 +20,10 @@ git reset --hard v$2 popd ln -sf $1 $1-$2 -tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./ +tar czf \ + ${CURRDIR}/rubygem-$1-$2-full.tar.gz \ + "--exclude=nokogiri-$2/./.git" \ + $1-$2/./ popd diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 0b7647a..3b01405 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.17.1 +%global mainver 1.17.2 #%%global prever .rc4 %global baserelease 1 @@ -276,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Dec 13 2024 Mamoru TASAKA - 1.17.2-1 +- 1.17.2 + * Wed Dec 11 2024 Mamoru TASAKA - 1.17.1-1 - 1.17.1 diff --git a/sources b/sources index 543d339..d37af1f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.17.1.gem) = 78fd03661569b123fe413a37b4918db8c0c3db4b0fe5374569fa424140be7cf933984f55ec458ee88eb50c116f6a23ae3cac94df1f1b34a1e49f14377c0c8d2e -SHA512 (rubygem-nokogiri-1.17.1-full.tar.gz) = a795f18e8fc756f53e5a205f13c7bd0fbc83f3c8fa1e20c43af9ba4a0400bb9a28dd9fb85f710c17b659b5471e88500c6248716756f3a9e22e253026a14411f6 +SHA512 (rubygem-nokogiri-1.17.2-full.tar.gz) = b084f6147da307d4d18e20eebda56ef69369a14451b61781064ef3c652816e4b66c80e4104a95b942217cd920be344104d5d3dda537340b461ffd64d84cae86b +SHA512 (nokogiri-1.17.2.gem) = fc2afbb1599d5349a178b2588ec7e0238eace643fc3abe8aef476f64c0e6edd9802925f9f8fd987f0a561b075e14be79a6efb365eadec0095c716c44d4be02cb From a6711e5dec0d4536fd90519e40ef53e2a190bcff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 28 Dec 2024 23:02:11 +0900 Subject: [PATCH 085/103] 1.18.0 --- rubygem-nokogiri.spec | 6 ++++-- sources | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 3b01405..542910f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.17.2 +%global mainver 1.18.0 #%%global prever .rc4 %global baserelease 1 @@ -52,7 +52,6 @@ BuildRequires: libxslt-devel BuildRequires: ruby-devel # ruby27 needs this explicitly BuildRequires: rubygem(racc) -Requires: rubygem(racc) %description Nokogiri parses and searches XML/HTML very quickly, and also has @@ -276,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Dec 28 2024 Mamoru TASAKA - 1.18.0-1 +- 1.18.0 + * Fri Dec 13 2024 Mamoru TASAKA - 1.17.2-1 - 1.17.2 diff --git a/sources b/sources index d37af1f..d5e6cdf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-nokogiri-1.17.2-full.tar.gz) = b084f6147da307d4d18e20eebda56ef69369a14451b61781064ef3c652816e4b66c80e4104a95b942217cd920be344104d5d3dda537340b461ffd64d84cae86b -SHA512 (nokogiri-1.17.2.gem) = fc2afbb1599d5349a178b2588ec7e0238eace643fc3abe8aef476f64c0e6edd9802925f9f8fd987f0a561b075e14be79a6efb365eadec0095c716c44d4be02cb +SHA512 (rubygem-nokogiri-1.18.0-full.tar.gz) = c61057f4cf99a8ea24f74dd1e62905b8aa132dfce2780a10428ff19bd5282ede8f7bbfc42e1ad79924e8f759e6336ab3a1783e57348d36b69fef4d959c9a7e5f +SHA512 (nokogiri-1.18.0.gem) = 2a7420375b0316a73c3fb7a23a6d7496b82ce7af818e0698dc29cacb07645e726e4a97ea7e8413a1cb5f362ffdd40280544c85adac5d1ca3b4219b5aec732cf6 From e12aade9bb4f1fe613295edbc2990ab18642cc82 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2024 16:53:37 +0900 Subject: [PATCH 086/103] 1.18.1 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 542910f..fc87a72 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.0 +%global mainver 1.18.1 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Dec 30 2024 Mamoru TASAKA - 1.18.1-1 +- 1.18.1 + * Sat Dec 28 2024 Mamoru TASAKA - 1.18.0-1 - 1.18.0 diff --git a/sources b/sources index d5e6cdf..af1ee43 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-nokogiri-1.18.0-full.tar.gz) = c61057f4cf99a8ea24f74dd1e62905b8aa132dfce2780a10428ff19bd5282ede8f7bbfc42e1ad79924e8f759e6336ab3a1783e57348d36b69fef4d959c9a7e5f -SHA512 (nokogiri-1.18.0.gem) = 2a7420375b0316a73c3fb7a23a6d7496b82ce7af818e0698dc29cacb07645e726e4a97ea7e8413a1cb5f362ffdd40280544c85adac5d1ca3b4219b5aec732cf6 +SHA512 (nokogiri-1.18.1.gem) = 1767b70813504ae02a3cbad47897804ee1ba7596cf53979b890745165ea7b1016b62c67f0ed2b3bdef142062178cf7c0cae917b51391c006287e6157bdc047cf +SHA512 (rubygem-nokogiri-1.18.1-full.tar.gz) = 023a443ca137392eb181ecfe9d4a256525ce249a1e6be0aa612a47e046678769035f7596b90dfc0378276ddddc1796cb2612e82b7e136acf7b08e3ad19a6f784 From 37ea4b420c0fda264c5497aff61137760ff3b22a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 08:09:29 +0900 Subject: [PATCH 087/103] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index fc87a72..322f9de 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.1 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Jan 07 2025 Mamoru TASAKA - 1.18.1-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Mon Dec 30 2024 Mamoru TASAKA - 1.18.1-1 - 1.18.1 From e06b31a6f9d4ed36b3df75faf54d5dc92c84282d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:42:50 +0000 Subject: [PATCH 088/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 322f9de..a574429 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.1 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 07 2025 Mamoru TASAKA - 1.18.1-2 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 From 98347adc8c9c618f802ba17369b63be756577642 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Jan 2025 09:03:11 +0900 Subject: [PATCH 089/103] 1.18.2 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index a574429..c77d7a7 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.18.1 +%global mainver 1.18.2 #%%global prever .rc4 -%global baserelease 3 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Jan 20 2025 Mamoru TASAKA - 1.18.2-1 +- 1.18.2 + * Sat Jan 18 2025 Fedora Release Engineering - 1.18.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index af1ee43..23db84b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.1.gem) = 1767b70813504ae02a3cbad47897804ee1ba7596cf53979b890745165ea7b1016b62c67f0ed2b3bdef142062178cf7c0cae917b51391c006287e6157bdc047cf -SHA512 (rubygem-nokogiri-1.18.1-full.tar.gz) = 023a443ca137392eb181ecfe9d4a256525ce249a1e6be0aa612a47e046678769035f7596b90dfc0378276ddddc1796cb2612e82b7e136acf7b08e3ad19a6f784 +SHA512 (nokogiri-1.18.2.gem) = 205c863ee8027224503f26072c6ac69e42348e2927496b0e30408062ed81f705786c1e3f8fdcf1f7ee7d92d76f93c48f07f6879883ef50d9af0a08a75b2982de +SHA512 (rubygem-nokogiri-1.18.2-full.tar.gz) = d4020aefef2865eff6d17f6c41387d550668d777b51797fdb98e9613c0d75efba2440687b53ceb1402e30e32709e4228fdabf05e6ae7124cb50e3ab6ade66389 From 434ddac2596e65cdc8feef0b63e29c74078fb6dd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 19 Feb 2025 14:57:51 +0900 Subject: [PATCH 090/103] 1.18.3 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index c77d7a7..94dbbcd 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.2 +%global mainver 1.18.3 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Feb 19 2025 Mamoru TASAKA - 1.18.3-1 +- 1.18.3 + * Mon Jan 20 2025 Mamoru TASAKA - 1.18.2-1 - 1.18.2 diff --git a/sources b/sources index 23db84b..0a3d31b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.2.gem) = 205c863ee8027224503f26072c6ac69e42348e2927496b0e30408062ed81f705786c1e3f8fdcf1f7ee7d92d76f93c48f07f6879883ef50d9af0a08a75b2982de -SHA512 (rubygem-nokogiri-1.18.2-full.tar.gz) = d4020aefef2865eff6d17f6c41387d550668d777b51797fdb98e9613c0d75efba2440687b53ceb1402e30e32709e4228fdabf05e6ae7124cb50e3ab6ade66389 +SHA512 (nokogiri-1.18.3.gem) = 538f3e61b016e52f32aea234519fbdc16e7d64233e81227741a0aaa23ebf8b4e30c74e7cfbdaad19a7d66cc3660a5e8f5bf2323f9422e79f5d6dab2878b87171 +SHA512 (rubygem-nokogiri-1.18.3-full.tar.gz) = 6fba269485cd8ba6ac42d4c31a46b64c3999c5eeb6a57e396d938b474f67333047be752b7fa48f11f579e806a48532d109950f6bbac92b6eff716a27fda68fca From e17abae0b19d1715d0c7a6b01ce94aa93d2a9b0b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 16 Mar 2025 13:53:21 +0900 Subject: [PATCH 091/103] 1.18.4 --- nokogiri-create-full-tarball.sh | 13 +++++++++++++ rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/nokogiri-create-full-tarball.sh b/nokogiri-create-full-tarball.sh index a204942..1cb4822 100644 --- a/nokogiri-create-full-tarball.sh +++ b/nokogiri-create-full-tarball.sh @@ -1,5 +1,17 @@ #!/bin/bash +git_restore_timestamp() +{ + set +x + echo "Restore timestamps" + git ls-tree -r --name-only HEAD | while read f + do + unixtime=$(git log -n 1 --pretty='%ct' -- $f) + touch -d "@${unixtime}" $f + done + set -x +} + if [ $# -lt 2 ] then echo "$0 " @@ -17,6 +29,7 @@ pushd $TMPDIRPATH git clone https://github.com/sparklemotion/$1.git pushd $1 git reset --hard v$2 +git_restore_timestamp popd ln -sf $1 $1-$2 diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 94dbbcd..b1a30f3 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.3 +%global mainver 1.18.4 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Mar 16 2025 Mamoru TASAKA - 1.18.4-1 +- 1.18.4 + * Wed Feb 19 2025 Mamoru TASAKA - 1.18.3-1 - 1.18.3 diff --git a/sources b/sources index 0a3d31b..6a81b39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.3.gem) = 538f3e61b016e52f32aea234519fbdc16e7d64233e81227741a0aaa23ebf8b4e30c74e7cfbdaad19a7d66cc3660a5e8f5bf2323f9422e79f5d6dab2878b87171 -SHA512 (rubygem-nokogiri-1.18.3-full.tar.gz) = 6fba269485cd8ba6ac42d4c31a46b64c3999c5eeb6a57e396d938b474f67333047be752b7fa48f11f579e806a48532d109950f6bbac92b6eff716a27fda68fca +SHA512 (nokogiri-1.18.4.gem) = c66683a1d216a615a40eadade8874b56fa5d6b4b3bfc836f7b245f4177746b755496c3d871c7a08ec3d6f393045b4709ba082ed8313b9496a127a90b20c0bf7c +SHA512 (rubygem-nokogiri-1.18.4-full.tar.gz) = 212d1c8497fe5161249e6155f49930d95a5db70812685af1716038344cb696fd272f800aacb574c5d1e971484e9738ae40ff0afeb001e6f094e88da90bb7567a From dd0fd3c652245c7539c7888bb3d033c2c78caa45 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 20 Mar 2025 12:13:02 +0900 Subject: [PATCH 092/103] 1.18.5 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index b1a30f3..fac780c 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.4 +%global mainver 1.18.5 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Mar 20 2025 Mamoru TASAKA - 1.18.5-1 +- 1.18.5 + * Sun Mar 16 2025 Mamoru TASAKA - 1.18.4-1 - 1.18.4 diff --git a/sources b/sources index 6a81b39..84eea72 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.4.gem) = c66683a1d216a615a40eadade8874b56fa5d6b4b3bfc836f7b245f4177746b755496c3d871c7a08ec3d6f393045b4709ba082ed8313b9496a127a90b20c0bf7c -SHA512 (rubygem-nokogiri-1.18.4-full.tar.gz) = 212d1c8497fe5161249e6155f49930d95a5db70812685af1716038344cb696fd272f800aacb574c5d1e971484e9738ae40ff0afeb001e6f094e88da90bb7567a +SHA512 (nokogiri-1.18.5.gem) = 70bcefca99d695d047f3b4c943a2a7ddc835a741f395685fe817cf71d2756e12b5ec250cea6df36daea758cffac238d866881eb913892d9a32254581835c2183 +SHA512 (rubygem-nokogiri-1.18.5-full.tar.gz) = 6652666ce4966f02851dbcc1e1867e217f93203e43bea9db909ea85a3ffde2dff9d0e15c190b4b91c5f2507aff45f3a264a77aee46e70ff8dc76fde2a73f70ca From ca10768dbd1349b23a727b79ddf346d5074022c7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 26 Mar 2025 16:00:41 +0900 Subject: [PATCH 093/103] Suppress warnings from Nokogiri::VERSION_INFO (bug 2354787) --- ...kogiri-1.11.0.rc4-shutdown-libxml2-warning.patch | 13 ++++++++----- rubygem-nokogiri.spec | 5 ++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch b/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch index c1ed61c..6a34634 100644 --- a/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch +++ b/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch @@ -1,10 +1,13 @@ ---- nokogiri-1.11.0.rc4/lib/nokogiri/version/info.rb.warn 2020-12-31 16:56:11.533949657 +0900 -+++ nokogiri-1.11.0.rc4/lib/nokogiri/version/info.rb 2020-12-31 16:59:38.576697147 +0900 -@@ -58,6 +58,7 @@ module Nokogiri +--- nokogiri-1.18.5/lib/nokogiri/version/info.rb.warn 2023-11-29 01:25:54.000000000 +0900 ++++ nokogiri-1.18.5/lib/nokogiri/version/info.rb 2025-03-26 15:51:51.468291434 +0900 +@@ -70,6 +70,10 @@ module Nokogiri + end def warnings ++ [] ++ end ++ ++ def warnings_original warnings = [] -+ return warnings if libxml2? - if compiled_libxml_version != loaded_libxml_version diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index fac780c..214daf5 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.5 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Mar 26 2025 Mamoru TASAKA - 1.18.5-2 +- Suppress warnings from Nokogiri::VERSION_INFO (bug 2354787) + * Thu Mar 20 2025 Mamoru TASAKA - 1.18.5-1 - 1.18.5 From c517880ca1ebfb9968699811d38cb82d66619e9f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 29 Mar 2025 14:29:20 +0900 Subject: [PATCH 094/103] 1.18.6 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 214daf5..35e9346 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.18.5 +%global mainver 1.18.6 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Mar 29 2025 Mamoru TASAKA - 1.18.6-1 +- 1.18.6 + * Wed Mar 26 2025 Mamoru TASAKA - 1.18.5-2 - Suppress warnings from Nokogiri::VERSION_INFO (bug 2354787) diff --git a/sources b/sources index 84eea72..da4a41e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.5.gem) = 70bcefca99d695d047f3b4c943a2a7ddc835a741f395685fe817cf71d2756e12b5ec250cea6df36daea758cffac238d866881eb913892d9a32254581835c2183 -SHA512 (rubygem-nokogiri-1.18.5-full.tar.gz) = 6652666ce4966f02851dbcc1e1867e217f93203e43bea9db909ea85a3ffde2dff9d0e15c190b4b91c5f2507aff45f3a264a77aee46e70ff8dc76fde2a73f70ca +SHA512 (nokogiri-1.18.6.gem) = e751f5650affb5423038fe809e8206bf434e41fcc7fcf8c11878662f56d12c023e92e226b76ad0debd93acbbfe2dd5e3b21c8b5199ea66617182753e9fb0c4d5 +SHA512 (rubygem-nokogiri-1.18.6-full.tar.gz) = ab8d1b9ed0a17a226eef62db7ccadb8b686c90f7bbaee28fa30a96c36470329758d6433a083b0d5b6d0d963bc845304144a4217022af896f42d712b17cbafdd2 From 863c1b5775ab7c5c4e40dc821624771967d7b94d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Apr 2025 16:14:38 +0900 Subject: [PATCH 095/103] 1.18.7 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 35e9346..d2a6bcf 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.6 +%global mainver 1.18.7 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Apr 07 2025 Mamoru TASAKA - 1.18.7-1 +- 1.18.7 + * Sat Mar 29 2025 Mamoru TASAKA - 1.18.6-1 - 1.18.6 diff --git a/sources b/sources index da4a41e..ebe953c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.6.gem) = e751f5650affb5423038fe809e8206bf434e41fcc7fcf8c11878662f56d12c023e92e226b76ad0debd93acbbfe2dd5e3b21c8b5199ea66617182753e9fb0c4d5 -SHA512 (rubygem-nokogiri-1.18.6-full.tar.gz) = ab8d1b9ed0a17a226eef62db7ccadb8b686c90f7bbaee28fa30a96c36470329758d6433a083b0d5b6d0d963bc845304144a4217022af896f42d712b17cbafdd2 +SHA512 (nokogiri-1.18.7.gem) = 96673311f4917617e303d90d92209d5b4ea348d3222298c52ae1e7ee2bcf7ff26a315f96b6f892894820a1e0abbe5b703dfda34565660ad985e7b56f01716a9b +SHA512 (rubygem-nokogiri-1.18.7-full.tar.gz) = 4e9d007c664752391708e93858c7f3a334cdc51a5505cf529f6af6e5729ce2bfe24b0dc6abaa11d44269e4212fbd30bbf11e167bb4bda65c6c1073515c5bd9a4 From 31378a8aa8b07d4f8cfc956af4dfe8d5dbe9ccb0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 23 Apr 2025 15:17:28 +0900 Subject: [PATCH 096/103] 1.18.8 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index d2a6bcf..2151041 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.7 +%global mainver 1.18.8 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Apr 23 2025 Mamoru TASAKA - 1.18.8-1 +- 1.18.8 + * Mon Apr 07 2025 Mamoru TASAKA - 1.18.7-1 - 1.18.7 diff --git a/sources b/sources index ebe953c..21e398b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.7.gem) = 96673311f4917617e303d90d92209d5b4ea348d3222298c52ae1e7ee2bcf7ff26a315f96b6f892894820a1e0abbe5b703dfda34565660ad985e7b56f01716a9b -SHA512 (rubygem-nokogiri-1.18.7-full.tar.gz) = 4e9d007c664752391708e93858c7f3a334cdc51a5505cf529f6af6e5729ce2bfe24b0dc6abaa11d44269e4212fbd30bbf11e167bb4bda65c6c1073515c5bd9a4 +SHA512 (nokogiri-1.18.8.gem) = 972f5d3aba21a2e9baa373c19344dcc4fe6bc6190b1ae7b6eccd34af5d4be025df1172c57e25ae82b4b3e71d95fd418e5e7a8e981958da6ff34a240ea90a4040 +SHA512 (rubygem-nokogiri-1.18.8-full.tar.gz) = 2be919e4e63a6ad162cdba7fae68e9f2a513ff0785773f4672249ebb7b25eaaacc8e4e824f9e7120144197dde8e29dc1595da6414b452ad624e96c6730e09628 From 7f3c8a2fe9124d596c0493b6865165f4788fd6ee Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 21 Jul 2025 17:43:50 +0900 Subject: [PATCH 097/103] 1.18.9 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 2151041..ca38a21 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.8 +%global mainver 1.18.9 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Jul 21 2025 Mamoru TASAKA - 1.18.9-1 +- 1.18.9 + * Wed Apr 23 2025 Mamoru TASAKA - 1.18.8-1 - 1.18.8 diff --git a/sources b/sources index 21e398b..04dcba3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.8.gem) = 972f5d3aba21a2e9baa373c19344dcc4fe6bc6190b1ae7b6eccd34af5d4be025df1172c57e25ae82b4b3e71d95fd418e5e7a8e981958da6ff34a240ea90a4040 -SHA512 (rubygem-nokogiri-1.18.8-full.tar.gz) = 2be919e4e63a6ad162cdba7fae68e9f2a513ff0785773f4672249ebb7b25eaaacc8e4e824f9e7120144197dde8e29dc1595da6414b452ad624e96c6730e09628 +SHA512 (nokogiri-1.18.9.gem) = 3d51fb952f5b63026c0753ccc81c6d553b0680b658f883e8fb13b53daf1374168997226ccbb696cef2d5d600a978ee9364959692d4d9586f77c8aee242c07241 +SHA512 (rubygem-nokogiri-1.18.9-full.tar.gz) = 873e1290f145959dedb012248ef1b56a4609ab8c2f819eddfd89b3a5416286e5a06dfe9f81673b7393b94248b1be26119b1130cf410e8d92f2d556ef9a64f199 From 1aa1d6422a7551b893cf1168fee050a6a26f3afd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:38:16 +0000 Subject: [PATCH 098/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index ca38a21..cf0aa28 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.9 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.18.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 21 2025 Mamoru TASAKA - 1.18.9-1 - 1.18.9 From 0af2370f2fe8e1b540489b91bf83c1cc237bd72c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Sep 2025 16:41:29 +0900 Subject: [PATCH 099/103] 1.18.10 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index cf0aa28..700765b 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.18.9 +%global mainver 1.18.10 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Sep 15 2025 Mamoru TASAKA - 1.18.10-1 +- 1.18.10 + * Fri Jul 25 2025 Fedora Release Engineering - 1.18.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 04dcba3..2c3b067 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.9.gem) = 3d51fb952f5b63026c0753ccc81c6d553b0680b658f883e8fb13b53daf1374168997226ccbb696cef2d5d600a978ee9364959692d4d9586f77c8aee242c07241 -SHA512 (rubygem-nokogiri-1.18.9-full.tar.gz) = 873e1290f145959dedb012248ef1b56a4609ab8c2f819eddfd89b3a5416286e5a06dfe9f81673b7393b94248b1be26119b1130cf410e8d92f2d556ef9a64f199 +SHA512 (nokogiri-1.18.10.gem) = 82d7cefeedb3328cc427ce6eb6394ef07d18c6b5a4d495e3f3c0270320dcd64904b1229e427780fda48b8877bfae5043df000fd850bb303ed09735d3ba63f974 +SHA512 (rubygem-nokogiri-1.18.10-full.tar.gz) = a230b8da7ad7eb01f496a87b89c0e78799cccc7726e7d8ee8ee09841c82d819bf269700f98effce69ff2b8d2926de085cfda8e350c7d77a463ea25d875f12cf8 From 3c9b3b041ffce60176b3a8bf1ab0feead74d84f7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 Dec 2025 14:06:09 +0900 Subject: [PATCH 100/103] 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 101/103] 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 102/103] 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 103/103] 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