From de0a9ae9f2b6b5259fa2c095d0229e333ab7e49f Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Jan 22 2013 14:52:00 +0000
Subject: Upgrade to Ruby 2.0.0 (r38894).

Enable test_stack_size(TestFiber) on PPC, since it was fixed upstream.

---

diff --git a/ruby-1.9.3-added-site-and-vendor-arch-flags.patch b/ruby-1.9.3-added-site-and-vendor-arch-flags.patch
index 45dbc08..c3b007b 100644
--- a/ruby-1.9.3-added-site-and-vendor-arch-flags.patch
+++ b/ruby-1.9.3-added-site-and-vendor-arch-flags.patch
@@ -134,7 +134,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
 index 03c3332..79b8e44 100755
 --- a/tool/mkconfig.rb
 +++ b/tool/mkconfig.rb
-@@ -44,6 +44,8 @@ continued_name = nil
+@@ -45,6 +45,8 @@ continued_name = nil
  continued_line = nil
  path_version = "/$(ruby_version)"
  archdir_override = "$(vendorlibdir)/$(sitearch)"
@@ -143,7 +143,7 @@ index 03c3332..79b8e44 100755
  File.foreach "config.status" do |line|
    next if /^#/ =~ line
    name = nil
-@@ -80,6 +82,8 @@ File.foreach "config.status" do |line|
+@@ -81,6 +83,8 @@ File.foreach "config.status" do |line|
      when /^RUBY_SO_NAME$/; next if $so_name
      when /^arch$/; if val.empty? then val = arch else arch = val end
      when /^archdir$/; archdir_override = val; next
@@ -152,7 +152,7 @@ index 03c3332..79b8e44 100755
      when /^sitearch/; val = '$(arch)' if val.empty?
      end
      case val
-@@ -214,11 +218,11 @@ print <<EOS
+@@ -217,11 +221,11 @@ print <<EOS
  EOS
  print <<EOS unless v_disabled["sitedir"]
    CONFIG["sitelibdir"] = "$(sitedir)#{path_version}"
diff --git a/ruby-1.9.3-arch-specific-dir.patch b/ruby-1.9.3-arch-specific-dir.patch
index 5906b4c..8bfce1f 100644
--- a/ruby-1.9.3-arch-specific-dir.patch
+++ b/ruby-1.9.3-arch-specific-dir.patch
@@ -88,7 +88,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
 index d9e26c1..03c3332 100755
 --- a/tool/mkconfig.rb
 +++ b/tool/mkconfig.rb
-@@ -43,6 +43,7 @@ vars = {}
+@@ -44,6 +44,7 @@ vars = {}
  continued_name = nil
  continued_line = nil
  path_version = "/$(ruby_version)"
@@ -96,7 +96,7 @@ index d9e26c1..03c3332 100755
  File.foreach "config.status" do |line|
    next if /^#/ =~ line
    name = nil
-@@ -78,6 +79,7 @@ File.foreach "config.status" do |line|
+@@ -79,6 +80,7 @@ File.foreach "config.status" do |line|
      when /^RUBY_INSTALL_NAME$/; next if $install_name
      when /^RUBY_SO_NAME$/; next if $so_name
      when /^arch$/; if val.empty? then val = arch else arch = val end
@@ -104,7 +104,7 @@ index d9e26c1..03c3332 100755
      when /^sitearch/; val = '$(arch)' if val.empty?
      end
      case val
-@@ -208,7 +210,7 @@ print(*v_fast)
+@@ -211,7 +213,7 @@ print(*v_fast)
  print(*v_others)
  print <<EOS
    CONFIG["rubylibdir"] = "$(rubylibprefix)#{path_version}"
diff --git a/ruby-1.9.3-custom-rubygems-location.patch b/ruby-1.9.3-custom-rubygems-location.patch
index b4d95a6..aa3ca67 100644
--- a/ruby-1.9.3-custom-rubygems-location.patch
+++ b/ruby-1.9.3-custom-rubygems-location.patch
@@ -41,7 +41,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
 index 79b8e44..9cef0c6 100755
 --- a/tool/mkconfig.rb
 +++ b/tool/mkconfig.rb
-@@ -85,6 +85,7 @@ File.foreach "config.status" do |line|
+@@ -86,6 +86,7 @@ File.foreach "config.status" do |line|
      when /^sitearchdir$/; sitearchdir_override = val; next
      when /^vendorarchdir$/; vendorarchdir_override = val; next
      when /^sitearch/; val = '$(arch)' if val.empty?
diff --git a/ruby-1.9.3-disable-versioned-paths.patch b/ruby-1.9.3-disable-versioned-paths.patch
index be13c08..75aeab4 100644
--- a/ruby-1.9.3-disable-versioned-paths.patch
+++ b/ruby-1.9.3-disable-versioned-paths.patch
@@ -53,7 +53,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
 index f9d97d3..d9e26c1 100755
 --- a/tool/mkconfig.rb
 +++ b/tool/mkconfig.rb
-@@ -42,6 +42,7 @@ v_others = []
+@@ -43,6 +43,7 @@ v_runtime = {}
  vars = {}
  continued_name = nil
  continued_line = nil
@@ -61,7 +61,7 @@ index f9d97d3..d9e26c1 100755
  File.foreach "config.status" do |line|
    next if /^#/ =~ line
    name = nil
-@@ -139,6 +140,8 @@ File.foreach "config.status" do |line|
+@@ -142,6 +143,8 @@ File.foreach "config.status" do |line|
      case name
      when "ruby_version"
        version = val[/\A"(.*)"\z/, 1]
@@ -70,7 +70,7 @@ index f9d97d3..d9e26c1 100755
      end
    end
  #  break if /^CEOF/
-@@ -204,15 +207,15 @@ end
+@@ -207,15 +210,15 @@ end
  print(*v_fast)
  print(*v_others)
  print <<EOS
diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch
index df88a50..30ffea8 100644
--- a/ruby-1.9.3-mkmf-verbose.patch
+++ b/ruby-1.9.3-mkmf-verbose.patch
@@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb
 index ded4e89..0870f22 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -1747,7 +1747,7 @@ SRC
+@@ -1752,7 +1752,7 @@ SRC
  SHELL = /bin/sh
  
  # V=0 quiet, V=1 verbose.  other values don't work.
diff --git a/ruby.spec b/ruby.spec
index 30e8397..6d5b5bc 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -13,7 +13,7 @@
 #%%global milestone preview2
 
 # Keep the revision enabled for pre-releases from SVN.
-%global revision 38848
+%global revision 38894
 
 %global ruby_archive %{name}-%{ruby_version}
 
@@ -524,12 +524,6 @@ DISABLE_TESTS="-x test_dl2.rb $DISABLE_TESTS"
 DISABLE_TESTS="-x test_io.rb $DISABLE_TESTS"
 %endif
 
-%ifarch ppc
-# test_stack_size(TestFiber) fails.
-# https://bugs.ruby-lang.org/issues/7719
-DISABLE_TESTS="-x test_fiber.rb $DISABLE_TESTS"
-%endif
-
 make check TESTS="-v $DISABLE_TESTS"
 
 %post libs -p /sbin/ldconfig
@@ -812,8 +806,8 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
-* Mon Jan 21 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.0-0.1.r38848
-- Upgrade to Ruby 2.0.0 (r38848).
+* Mon Jan 21 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.0-0.1.r38894
+- Upgrade to Ruby 2.0.0 (r38894).
 - Build against libdb instead of libdb4 (rhbz#894022).
 - Provide nonversioned packageconfig (rhbz#789532) and fix provided variables.
 - Move native extensions from exts to ruby directory.
diff --git a/rubygems-1.8.11-binary-extensions.patch b/rubygems-1.8.11-binary-extensions.patch
index 4517e0a..e158896 100644
--- a/rubygems-1.8.11-binary-extensions.patch
+++ b/rubygems-1.8.11-binary-extensions.patch
@@ -11,7 +11,7 @@ diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
 index 97db19e..263e7d3 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1250,6 +1250,12 @@ class Gem::Specification
+@@ -1256,6 +1256,12 @@ class Gem::Specification
        File.join full_gem_path, path
      end
  
@@ -24,7 +24,7 @@ index 97db19e..263e7d3 100644
      # gem directories must come after -I and ENV['RUBYLIB']
      insert_index = Gem.load_path_insert_index
  
-@@ -1368,11 +1374,16 @@ class Gem::Specification
+@@ -1374,11 +1380,16 @@ class Gem::Specification
  
    def contains_requirable_file? file
      root     = full_gem_path
@@ -43,7 +43,7 @@ index 97db19e..263e7d3 100644
      end
    end
  
-@@ -1668,6 +1679,23 @@ class Gem::Specification
+@@ -1674,6 +1685,23 @@ class Gem::Specification
    end
  
    ##
@@ -85,7 +85,7 @@ diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
 index 74d803d..0063c7f 100644
 --- a/lib/rubygems/installer.rb
 +++ b/lib/rubygems/installer.rb
-@@ -641,7 +641,7 @@ TEXT
+@@ -642,7 +642,7 @@ TEXT
        say "This could take a while..."
      end
  
@@ -98,7 +98,7 @@ diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
 index 263e7d3..d31b93b 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1683,16 +1683,15 @@ class Gem::Specification
+@@ -1689,16 +1689,15 @@ class Gem::Specification
    # eg: /usr/local/lib/ruby/1.8/exts/mygem-1.0
  
    def ext_dir
@@ -135,7 +135,7 @@ diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
 index d31b93b..e65ea2d 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1250,11 +1250,7 @@ class Gem::Specification
+@@ -1256,11 +1256,7 @@ class Gem::Specification
        File.join full_gem_path, path
      end
  
@@ -148,7 +148,7 @@ index d31b93b..e65ea2d 100644
  
      # gem directories must come after -I and ENV['RUBYLIB']
      insert_index = Gem.load_path_insert_index
-@@ -1691,7 +1687,10 @@ class Gem::Specification
+@@ -1697,7 +1693,10 @@ class Gem::Specification
    # gem directory. eg: /usr/local/lib/ruby/1.8/gems
  
    def exts_dir
@@ -178,7 +178,7 @@ diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
 index 0063c7f..83b8fd5 100644
 --- a/lib/rubygems/installer.rb
 +++ b/lib/rubygems/installer.rb
-@@ -641,7 +641,7 @@ TEXT
+@@ -642,7 +642,7 @@ TEXT
        say "This could take a while..."
      end
  
@@ -191,7 +191,7 @@ diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
 index e65ea2d..8be2ade 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1250,7 +1250,7 @@ class Gem::Specification
+@@ -1256,7 +1256,7 @@ class Gem::Specification
        File.join full_gem_path, path
      end
  
@@ -200,7 +200,7 @@ index e65ea2d..8be2ade 100644
  
      # gem directories must come after -I and ENV['RUBYLIB']
      insert_index = Gem.load_path_insert_index
-@@ -1679,7 +1679,7 @@ class Gem::Specification
+@@ -1685,7 +1685,7 @@ class Gem::Specification
    # eg: /usr/local/lib/ruby/1.8/exts/mygem-1.0
  
    def ext_dir
@@ -274,7 +274,7 @@ diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
 index 8be2ade..f54210a 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1687,10 +1687,7 @@ class Gem::Specification
+@@ -1693,10 +1693,7 @@ class Gem::Specification
    # gem directory. eg: /usr/local/lib/ruby/1.8/gems
  
    def exts_dir