Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/rubygem-nokogiri.git#0708c9bfc0baad2696bbd9c85235b0fdd3d11ccb

.gitignore

@@ -52,3 +52,5 @@ nokogiri-1.4.3.1.gem
 /rubygem-nokogiri-1.10.9-full.tar.gz
 /nokogiri-1.10.10.gem
 /rubygem-nokogiri-1.10.10-full.tar.gz
+/nokogiri-1.11.0.rc4.gem
+/rubygem-nokogiri-1.11.0.rc4-full.tar.gz

rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch

@@ -0,0 +1,10 @@
+--- 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
+ 
+     def warnings
+       warnings = []
++      return warnings
+ 
+       if libxml2?
+         if compiled_libxml_version != loaded_libxml_version

rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch

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

rubygem-nokogiri.spec

@@ -1,7 +1,7 @@
-%global	mainver		1.10.10
-#%%global	prever		.rc3
+%global	mainver		1.11.0
+%global	prever		.rc4
 
-%global	mainrel		2
+%global	mainrel		1
 %global	prerpmver		%(echo "%{?prever}" | sed -e 's|\\.||g')
 
 %global	gem_name	nokogiri
@@ -17,18 +17,19 @@ License:	MIT
 URL:		http://nokogiri.rubyforge.org/nokogiri/
 Source0:	https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem
 # %%{SOURCE2} %%{name} %%{version}
-Source1:	rubygem-%{gem_name}-%{version}-full.tar.gz
+Source1:	rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz
 Source2:	nokogiri-create-full-tarball.sh
 # ./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
+Patch0:	%{name}-1.11.0.rc4-shutdown-libxml2-warning.patch
 BuildRequires:	ruby(release)
 BuildRequires:	ruby(rubygems)
 ##
 ## For %%check
 BuildRequires:	rubygem(minitest)
+BuildRequires:	rubygem(minitest-reporters)
 BuildRequires:	rubygems-devel
 Obsoletes:		ruby-%{gem_name} <= 1.5.2-2
 #BuildRequires:	ruby(racc)
@@ -159,6 +160,7 @@ cp -p %{gem_name}-%{version}/[A-Z]* %{buildroot}%{gem_instdir}/
 rm -rf %{buildroot}%{gem_instdir}/ext/%{gem_name}/
 rm -rf %{buildroot}%{gem_instdir}/tmp/
 rm -f %{buildroot}%{gem_instdir}/{.autotest,.require_paths,.gemtest,.travis.yml}
+rm -f %{buildroot}%{gem_instdir}/.vagant
 rm -f %{buildroot}%{gem_instdir}/appveyor.yml
 rm -f %{buildroot}%{gem_instdir}/.cross_rubies
 rm -f %{buildroot}%{gem_instdir}/{build_all,dependencies.yml,test_all}
@@ -187,8 +189,9 @@ sed -i test/helper.rb \
 	-e '\@require.*simplecov@,\@^end$@d'
 
 # Need investigation. For now anyway build
+env \
+	RUBYLIB=".:lib:test:ext" \
 	ruby \
-	-I.:lib:test:ext \
 	-e \
 	"require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \
 	exit 1
@@ -229,6 +232,9 @@ popd
 %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/
 
 %changelog
+* Thu Dec 31 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.11.0-0.1.rc4
+- 1.11.0.rc4
+
 * Thu Oct 22 2020 Vít Ondruch <vondruch@redhat.com> - 1.10.10-2
 - Drop unnecessary rubygem(pkg-config) dependency.
 

sources

@@ -1,2 +1,2 @@
-SHA512 (nokogiri-1.10.10.gem) = b4628df47dbd8b9123a6f0625829e745a19d26539d54b2748c985d6fdda978072bdcd136df2f47535984186eae7fb318b67d59f1ea413777f1a146bc78e0dae2
-SHA512 (rubygem-nokogiri-1.10.10-full.tar.gz) = 441bcb80afd9ea6eb0722c48b6df50e01f4977c7392b2c24bba0f9ea8a0755e63c6c28023730c960783b6c8a408b082ae8dd9982632131edd438fa7389a7b4f6
+SHA512 (nokogiri-1.11.0.rc4.gem) = fc5c7100632d2137cfcfad27e0bff67babc238252e6260c6aa8ae6a509ac8fb13bce43567552487390d13d5cb138ffc8a8b3935063512d03e7dfb202090beda6
+SHA512 (rubygem-nokogiri-1.11.0.rc4-full.tar.gz) = 3fd86214c757715600406a8a296f97876740b4492ff698a380d7895544aca6d3f2735f19a24ba2ac90af1429027ade91a989ff432b24aba5626b87caddd9ab46