From f340dfd4223ec7c301b750b31d9c58bd87155c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Mon, 15 Jun 2015 13:03:29 +0200
Subject: [PATCH] Upgrade to Ruby 2.3.0 (r50909).

---
 ...-paths-for-BigDecimal-and-io-console.patch | 51 -------------------
 ruby.spec                                     | 10 ++--
 2 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 ruby-2.3.0-Fix-require-paths-for-BigDecimal-and-io-console.patch

diff --git a/ruby-2.3.0-Fix-require-paths-for-BigDecimal-and-io-console.patch b/ruby-2.3.0-Fix-require-paths-for-BigDecimal-and-io-console.patch
deleted file mode 100644
index d43886a..0000000
--- a/ruby-2.3.0-Fix-require-paths-for-BigDecimal-and-io-console.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 4555bde348ed0c33f7969df014fc857539f5f5eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Thu, 11 Jun 2015 09:18:34 +0200
-Subject: [PATCH 1/2] Fix io-console require path.
-
----
- ext/io/console/io-console.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
-index 309b9bd..52ecdd9 100644
---- a/ext/io/console/io-console.gemspec
-+++ b/ext/io/console/io-console.gemspec
-@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
-   s.required_ruby_version = ">= 2.0.0"
-   s.homepage = "http://www.ruby-lang.org"
-   s.authors = ["Nobu Nakada"]
--  s.require_path = %[.]
-+  s.require_path = %[lib]
-   s.files = %w[console.c extconf.rb lib/console/size.rb]
-   s.extensions = %w[extconf.rb]
-   s.licenses = "ruby"
--- 
-2.4.0
-
-
-From ef7e13b70efd88d0eff3d060cfbd2df01f1f90d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Thu, 11 Jun 2015 09:22:57 +0200
-Subject: [PATCH 2/2] Fix bigdecimal require path.
-
----
- ext/bigdecimal/bigdecimal.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
-index e0c24db..c93c2b6 100644
---- a/ext/bigdecimal/bigdecimal.gemspec
-+++ b/ext/bigdecimal/bigdecimal.gemspec
-@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
-   s.email = "mrkn@mrkn.jp"
-   s.description = "This library provides arbitrary-precision decimal floating-point number class."
-   s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
--  s.require_path = %[.]
-+  s.require_path = %[lib]
-   s.files = %w[
-     bigdecimal.gemspec
-     bigdecimal.c
--- 
-2.4.0
-
diff --git a/ruby.spec b/ruby.spec
index 669fb0b..664c002 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -10,7 +10,7 @@
 #%%global milestone rc1
 
 # Keep the revision enabled for pre-releases from SVN.
-%global revision 50815
+%global revision 50909
 
 %global ruby_archive %{name}-%{ruby_version}
 
@@ -112,9 +112,6 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch
 # in support for ABRT.
 # http://bugs.ruby-lang.org/issues/8566
 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
-# Fix require paths for BigDecimal and io-console.
-# https://bugs.ruby-lang.org/issues/11249
-Patch7: ruby-2.3.0-Fix-require-paths-for-BigDecimal-and-io-console.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: ruby(rubygems) >= %{rubygems_version}
@@ -433,7 +430,6 @@ rm -rf ext/fiddle/libffi*
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -885,8 +881,8 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
-* Tue May 05 2015 Vít Ondruch <vondruch@rehdat.com> - 2.3.0-0.5.r50815
-- Upgrade to Ruby 2.3.0 (r50815).
+* Tue May 05 2015 Vít Ondruch <vondruch@rehdat.com> - 2.3.0-0.5.r50909
+- Upgrade to Ruby 2.3.0 (r50909).
 - Initialize all load paths in operating_system.rb.
 - Fix directory ownership.
 - Fix the git BR following the git package split.