Shutdown libxml2 version mismatch warning

This commit is contained in:
Mamoru TASAKA 2015-12-11 14:42:11 +09:00
parent 782cad3bcd
commit 66886d85fe
2 changed files with 16 additions and 2 deletions

View File

@ -0,0 +1,10 @@
--- 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

View File

@ -6,7 +6,7 @@
%global mainver 1.6.7
%global prever .rc3
%global mainrel 2
%global mainrel 3
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
@ -43,6 +43,8 @@ Source0: https://rubygems.org/gems/%{gemname}-%{mainver}%{?prever}.gem
# ./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
%if 0%{?fedora} >= 19
Requires: ruby(release)
BuildRequires: ruby(release)
@ -117,7 +119,7 @@ gem unpack %{SOURCE0}
cd %{gem_name}-%{version}
# patches
#%%patch0 -p1
%patch0 -p1
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
@ -262,6 +264,8 @@ popd
%{gemdir}/doc/%{gemname}-%{mainver}%{?prever}/
%changelog
* Fri Dec 11 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.6.7-0.3.rc3
- Shutdown libxml2 version mismatch warning
* Tue Dec 8 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.6.7-0.2.rc3
- Rebuild against new libxml2, to make rspec test succeed