Compare commits
22 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f64183f18a | ||
|
|
f276b8890f | ||
|
|
52f0942f45 | ||
|
|
3c9b3b041f | ||
|
|
0af2370f2f | ||
|
|
1aa1d6422a | ||
|
|
7f3c8a2fe9 | ||
|
|
31378a8aa8 | ||
|
|
863c1b5775 | ||
|
|
c517880ca1 | ||
|
|
ca10768dbd | ||
|
|
dd0fd3c652 | ||
|
|
e17abae0b1 | ||
|
|
434ddac259 | ||
|
|
98347adc8c | ||
|
|
e06b31a6f9 | ||
|
|
37ea4b420c | ||
|
|
e12aade9bb | ||
|
|
a6711e5dec | ||
|
|
941cbb1036 | ||
|
|
d0b3530cf5 | ||
|
|
ef798a222d |
6 changed files with 105 additions and 47 deletions
|
|
@ -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 <name> <version>"
|
||||
|
|
@ -17,10 +29,14 @@ 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
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
11
rubygem-nokogiri-1.18.10-minitest6.patch
Normal file
11
rubygem-nokogiri-1.18.10-minitest6.patch
Normal file
|
|
@ -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"
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 26e5ba521208706ae68f19062d4ad24ad257aa47 Mon Sep 17 00:00:00 2001
|
||||
From: Jun Aruga <jaruga@redhat.com>
|
||||
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
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
%global mainver 1.16.8
|
||||
%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
|
||||
|
|
@ -29,14 +29,12 @@ 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)
|
||||
BuildRequires: rubygem(minitest-mock)
|
||||
%if !0%{?rhel}
|
||||
# For test/xml/test_document_encoding.rb
|
||||
# Drop rubygem(rubyzip) build dependency in RHEL
|
||||
|
|
@ -55,7 +53,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
|
||||
|
|
@ -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,69 @@ popd
|
|||
%doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/
|
||||
|
||||
%changelog
|
||||
* Thu Jan 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.19.0-2
|
||||
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0
|
||||
|
||||
* Tue Dec 30 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.19.0-1
|
||||
- 1.19.0
|
||||
|
||||
* Wed Dec 24 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.10-2
|
||||
- Handle minitest 6 compatibility
|
||||
|
||||
* Mon Sep 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.10-1
|
||||
- 1.18.10
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Jul 21 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.9-1
|
||||
- 1.18.9
|
||||
|
||||
* Wed Apr 23 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.8-1
|
||||
- 1.18.8
|
||||
|
||||
* Mon Apr 07 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.7-1
|
||||
- 1.18.7
|
||||
|
||||
* Sat Mar 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.6-1
|
||||
- 1.18.6
|
||||
|
||||
* Wed Mar 26 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.5-2
|
||||
- Suppress warnings from Nokogiri::VERSION_INFO (bug 2354787)
|
||||
|
||||
* Thu Mar 20 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.5-1
|
||||
- 1.18.5
|
||||
|
||||
* Sun Mar 16 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.4-1
|
||||
- 1.18.4
|
||||
|
||||
* Wed Feb 19 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.3-1
|
||||
- 1.18.3
|
||||
|
||||
* Mon Jan 20 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.2-1
|
||||
- 1.18.2
|
||||
|
||||
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Tue Jan 07 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.1-2
|
||||
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4
|
||||
|
||||
* Mon Dec 30 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.1-1
|
||||
- 1.18.1
|
||||
|
||||
* Sat Dec 28 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.18.0-1
|
||||
- 1.18.0
|
||||
|
||||
* Fri Dec 13 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.17.2-1
|
||||
- 1.17.2
|
||||
|
||||
* Wed Dec 11 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.17.1-1
|
||||
- 1.17.1
|
||||
|
||||
* Mon Dec 09 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.17.0-1
|
||||
- 1.17.0
|
||||
|
||||
* Thu Dec 05 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.16.8-1
|
||||
- 1.16.8
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (nokogiri-1.16.8.gem) = 5dfcdc303dc1a6955f9e3831ca15ea76dad385e10df7d18b2d0b363498206f5fd1b7c24b2849a0199b311e174b8b77c18059b503e6c33e6cae43fffc4d9b0382
|
||||
SHA512 (rubygem-nokogiri-1.16.8-full.tar.gz) = 2737ac2b0f0283719803a7471edd3aebc4b3ef230bc22f77de7e764c360d8bf099ab3d807787df1254688cc9cec4727655f86bea508986ca8f5d665f3e32887e
|
||||
SHA512 (rubygem-nokogiri-1.19.0-full.tar.gz) = 29dd894b176857d55eb5e670f50e69762e74c0a13e6949030af17e3c84b65f9dfe0087210b84a7c77749d3d1a4a33292d62f7005003745e8f087d822ee64f4b1
|
||||
SHA512 (nokogiri-1.19.0.gem) = d9326a2e60b6ea3152c5f9d53df738610f18ca57cffcd3bf2f8b07a2b08b30085d0fce2ca8206279ad6a0f1a613e9e76821c09aef45cf5e5b2d00ff766734872
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue