From 04be328ec264a783c849ff15bf79656e2932f775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 5 Sep 2017 13:44:23 +0200
Subject: [PATCH] Update to RubyGems 2.6.13.

---
 .gitignore                                    |  1 +
 ...ored-test-for-real-world-default-gem.patch | 51 +++++++++++++++++++
 rubygems.spec                                 | 16 ++++--
 sources                                       |  2 +-
 4 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 rubygems-2.6.13-Ignored-test-for-real-world-default-gem.patch

diff --git a/.gitignore b/.gitignore
index 7d1b7f5..be25674 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ rubygems-1.3.7.tgz
 /rubygems-2.2.2.tgz
 /rubygems-2.4.8.tgz
 /rubygems-2.6.10.tgz
+/rubygems-2.6.13.tgz
diff --git a/rubygems-2.6.13-Ignored-test-for-real-world-default-gem.patch b/rubygems-2.6.13-Ignored-test-for-real-world-default-gem.patch
new file mode 100644
index 0000000..54e3ad0
--- /dev/null
+++ b/rubygems-2.6.13-Ignored-test-for-real-world-default-gem.patch
@@ -0,0 +1,51 @@
+From 8598da6ea02fe69c20f93ac4d5504ca4aba6fe6b Mon Sep 17 00:00:00 2001
+From: SHIBATA Hiroshi <hsbt@ruby-lang.org>
+Date: Wed, 9 Aug 2017 16:30:53 +0900
+Subject: [PATCH 1/2] Ignored test for real world default gem.
+
+  Because default gem was enabled after ruby installation that
+  is `make install`
+---
+ test/rubygems/test_require.rb | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
+index 936f78fb2..c44c759cc 100644
+--- a/test/rubygems/test_require.rb
++++ b/test/rubygems/test_require.rb
+@@ -303,6 +303,12 @@ def test_default_gem_only
+ 
+   def test_realworld_default_gem
+     skip "no default gems on ruby < 2.0" unless RUBY_VERSION >= "2"
++    begin
++      gem 'json'
++    rescue Gem::MissingSpecError
++      skip "default gems is only available after ruby installation"
++    end
++
+     cmd = <<-RUBY
+       $stderr = $stdout
+       require "json"
+
+From 0dafce8188691a7b942ed4724a0d0e462e74a809 Mon Sep 17 00:00:00 2001
+From: SHIBATA Hiroshi <hsbt@ruby-lang.org>
+Date: Wed, 9 Aug 2017 21:06:41 +0900
+Subject: [PATCH 2/2] Fixed grammer
+
+---
+ test/rubygems/test_require.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
+index c44c759cc..edb36f1f3 100644
+--- a/test/rubygems/test_require.rb
++++ b/test/rubygems/test_require.rb
+@@ -306,7 +306,7 @@ def test_realworld_default_gem
+     begin
+       gem 'json'
+     rescue Gem::MissingSpecError
+-      skip "default gems is only available after ruby installation"
++      skip "default gems are only available after ruby installation"
+     end
+ 
+     cmd = <<-RUBY
diff --git a/rubygems.spec b/rubygems.spec
index a9eed98..47e931d 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -3,7 +3,7 @@
 #
 
 # Bundled libraries versions
-%global molinillo_version 0.5.5
+%global molinillo_version 0.5.7
 
 # Requires versions
 %global io_console_version 0.4.6
@@ -32,8 +32,8 @@
 
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 2.6.10
-Release: 101%{?dist}
+Version: 2.6.13
+Release: 100%{?dist}
 Group: Development/Libraries
 License: Ruby or MIT
 
@@ -56,6 +56,11 @@ Source11: check_CVE-2013-4287.rb
 # http://seclists.org/oss-sec/2013/q3/605
 Source12: check_CVE-2013-4363.rb
 
+# Ignore failing TestGemRequire#test_realworld_default_gem with
+# --disable-gems option.
+# https://github.com/rubygems/rubygems/pull/1986
+Patch0: rubygems-2.6.13-Ignored-test-for-real-world-default-gem.patch
+
 %{?load:%{SOURCE5}}
 
 Requires:   ruby(release)
@@ -113,6 +118,8 @@ Documentation for %{name}.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 # Nothing
 
@@ -224,6 +231,9 @@ ruby %{SOURCE12}
 
 
 %changelog
+* Tue Sep 05 2017 Vít Ondruch <vondruch@redhat.com> - 2.6.13-100
+- Update to RubyGems 2.6.13.
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.10-101
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 5a84bbf..2e443bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rubygems-2.6.10.tgz) = 5f771e26fa57290a7dfb4c50778af4617964bb72141e757f538da2619ac36fa247715fb3f8cff314e5a573b27a38439c9a8a96fd37d806554e6f37d49608f6b7
+SHA512 (rubygems-2.6.13.tgz) = c952b6061a9a0778db304c3aa5bea693e71ae2564abfb19f8b123eef66eb1e3877fc7c36f4f1527da97bb320870cbfd4574ac57ad88e850a44fadd67ebdac152