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