This commit is contained in:
Mamoru TASAKA 2021-05-16 21:35:58 +09:00
parent 2ceaea6a75
commit ff224af82a
3 changed files with 22 additions and 5 deletions

2
.gitignore vendored
View File

@ -62,3 +62,5 @@ nokogiri-1.4.3.1.gem
/rubygem-nokogiri-1.11.2-full.tar.gz /rubygem-nokogiri-1.11.2-full.tar.gz
/nokogiri-1.11.3.gem /nokogiri-1.11.3.gem
/rubygem-nokogiri-1.11.3-full.tar.gz /rubygem-nokogiri-1.11.3-full.tar.gz
/nokogiri-1.11.4.gem
/rubygem-nokogiri-1.11.4-full.tar.gz

View File

@ -1,7 +1,7 @@
%global mainver 1.11.3 %global mainver 1.11.4
#%%global prever .rc4 #%%global prever .rc4
%global mainrel 2 %global mainrel 1
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global gem_name nokogiri %global gem_name nokogiri
@ -37,6 +37,8 @@ Obsoletes: ruby-%{gem_name} <= 1.5.2-2
BuildRequires: gcc BuildRequires: gcc
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
# Explicit write this for checking libxml2 version
BuildRequires: %{_bindir}/pkg-config
BuildRequires: ruby-devel BuildRequires: ruby-devel
# ruby27 needs this explicitly # ruby27 needs this explicitly
BuildRequires: rubygem(racc) BuildRequires: rubygem(racc)
@ -83,6 +85,16 @@ mv ../%{gem_name}-%{version}.gemspec .
# patches # patches
%patch0 -p1 %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 # remove bundled external libraries
sed -i \ sed -i \
-e 's|, "ports/archives/[^"][^"]*"||g' \ -e 's|, "ports/archives/[^"][^"]*"||g' \
@ -92,7 +104,7 @@ sed -i \
sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec
# Ummm... # Ummm...
LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec
%build %build
# 1.6.0 needs this # 1.6.0 needs this
@ -207,6 +219,9 @@ popd
%{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/
%changelog %changelog
* Sun May 16 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.11.4-1
- 1.11.4
* Fri May 07 2021 Vít Ondruch <vondruch@redhat.com> - 1.11.3-2 * Fri May 07 2021 Vít Ondruch <vondruch@redhat.com> - 1.11.3-2
- Remove rubygem(minitest-reporters) dependency. - Remove rubygem(minitest-reporters) dependency.

View File

@ -1,2 +1,2 @@
SHA512 (nokogiri-1.11.3.gem) = e11789a27ecbba6bd49eaa9180eafa782d3de6453e993f86079e45e8c1cc8014d1ae6d47fb5237d619a5b84870b94ef383ef117c78fcc8035922534b53c92524 SHA512 (nokogiri-1.11.4.gem) = 5e097027afe2394de60c08294bac5d5bb81f8a930fcc88dcf8d9b732d4d3336154c1b06ce07ca5c5f405a9ddd5413e092ac3a2a9ef9f432daea00cba9b7c2b07
SHA512 (rubygem-nokogiri-1.11.3-full.tar.gz) = 7fe528f65685c66058dbd3979bc1e33f08261c8ce9bad8ffee9f327161551769895bb65a23eb7d2ef467b80b5cda1453840c670b0a476294534daf37d5a46aa5 SHA512 (rubygem-nokogiri-1.11.4-full.tar.gz) = 79064637fbc28d68e0fbb38d64346ca7a6e28b53e6a4f0e896591a62c4487d0016f1a9f6cbfa254c6f3838691a87c316dfc4f20370dddf135e7badc21a106163