From 1b21521db922dee5f394939b505d6003366ef677 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 11 Dec 2015 14:41:09 +0900 Subject: [PATCH] Shutdown libxml2 version mismatch warning - 1.6.6.4 --- .gitignore | 1 + ...gem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch | 10 ++++++++++ rubygem-nokogiri.spec | 10 ++++++++-- sources | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch diff --git a/.gitignore b/.gitignore index 69681f2..56b25ff 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ nokogiri-1.4.3.1.gem /nokogiri-1.6.5.gem /nokogiri-1.6.6.1.gem /nokogiri-1.6.6.2.gem +/nokogiri-1.6.6.4.gem diff --git a/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch b/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch new file mode 100644 index 0000000..add8fe8 --- /dev/null +++ b/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch @@ -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 diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 9691c5b..f02965f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -3,7 +3,7 @@ %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %endif -%global mainver 1.6.6.2 +%global mainver 1.6.6.4 #%%global prever .beta.4 %global mainrel 1 @@ -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) @@ -115,7 +117,7 @@ gem unpack %{SOURCE0} cd %{gem_name}-%{version} # patches -#%%patch0 -p1 +%patch0 -p1 gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec @@ -257,6 +259,10 @@ popd %{gemdir}/doc/%{gemname}-%{mainver}%{?prever}/ %changelog +* Fri Dec 11 2015 Mamoru TASAKA - 1.6.6.4-1 +- Shutdown libxml2 version mismatch warning +- 1.6.6.4 + * Sun Jan 25 2015 Mamoru TASAKA - 1.6.6.2-1 - 1.6.6.2 diff --git a/sources b/sources index 0fa17eb..82c91bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc9f91534bf93d57b84f625b55732a7c nokogiri-1.6.6.2.gem +4741c48f07ee6bba99e6d10046ad99c6 nokogiri-1.6.6.4.gem