From f700ed56ad4625bbb49d3e29dbe72d16c7469ccf Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Feb 22 2013 13:15:00 +0000
Subject: Upgrade to Ruby 2.0.0 (r38297).


---

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 5f72381..4ec996a 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
@@ -29,7 +29,7 @@ diff --git a/configure.in b/configure.in
 index 8e4aaec..c65e0c7 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3170,6 +3170,15 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
+@@ -3172,6 +3172,15 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
      dir="${SITE_DIR}"
  done
  
@@ -45,7 +45,7 @@ index 8e4aaec..c65e0c7 100644
  AC_ARG_WITH(vendordir,
  	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
              [vendordir=$withval],
-@@ -3179,19 +3188,32 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
+@@ -3181,19 +3190,32 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
      dir="${VENDOR_DIR}"
  done
  
@@ -78,7 +78,7 @@ index 8e4aaec..c65e0c7 100644
  fi
  
  pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)'
-@@ -3209,6 +3231,13 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"],
+@@ -3211,6 +3233,13 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"],
    [
      RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\""
      ])
@@ -92,7 +92,7 @@ index 8e4aaec..c65e0c7 100644
  AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
    ["$RUBY_LIB_PREFIX/"*], [
      RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"'
-@@ -3216,6 +3245,13 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
+@@ -3218,6 +3247,13 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
    [
      RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\""
      ])
@@ -106,7 +106,7 @@ index 8e4aaec..c65e0c7 100644
  pat=`echo "$RUBY_EXEC_PREFIX/" | tr -c '\012' .`'\(.*\)'
  AS_CASE(["$RUBY_LIB_PREFIX"],
    ["$RUBY_EXEC_PREFIX/"*], [
-@@ -3237,11 +3273,13 @@ if test "x$SITE_DIR" = xno; then
+@@ -3239,11 +3275,13 @@ if test "x$SITE_DIR" = xno; then
      AC_DEFINE(NO_RUBY_SITE_LIB, [] !<verconf>!)
  else
      AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH} !<verconf>!)
@@ -120,7 +120,7 @@ index 8e4aaec..c65e0c7 100644
  fi
  
  AC_SUBST(arch)dnl
-@@ -3249,7 +3287,9 @@ AC_SUBST(sitearch)dnl
+@@ -3251,7 +3289,9 @@ AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
  AC_SUBST(archdir)dnl
  AC_SUBST(sitedir)dnl
@@ -143,7 +143,7 @@ index 03c3332..79b8e44 100755
  File.foreach "config.status" do |line|
    next if /^#/ =~ line
    name = nil
-@@ -79,6 +81,8 @@ File.foreach "config.status" do |line|
+@@ -80,6 +82,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
-@@ -213,11 +217,11 @@ print <<EOS
+@@ -214,11 +218,11 @@ print <<EOS
  EOS
  print <<EOS unless v_disabled["sitedir"]
    CONFIG["sitelibdir"] = "$(sitedir)#{path_version}"
diff --git a/ruby-1.9.3-always-use-i386.patch b/ruby-1.9.3-always-use-i386.patch
index 74e41d7..ae98ef5 100644
--- a/ruby-1.9.3-always-use-i386.patch
+++ b/ruby-1.9.3-always-use-i386.patch
@@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
 index c65e0c7..748edc9 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3294,6 +3294,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -3296,6 +3296,8 @@ AC_SUBST(vendorarchdir)dnl
  configure_args=$ac_configure_args
  AC_SUBST(configure_args)dnl
  
diff --git a/ruby-1.9.3-arch-specific-dir.patch b/ruby-1.9.3-arch-specific-dir.patch
index d8970cf..e1f025d 100644
--- a/ruby-1.9.3-arch-specific-dir.patch
+++ b/ruby-1.9.3-arch-specific-dir.patch
@@ -26,7 +26,7 @@ diff --git a/configure.in b/configure.in
 index db3641b..8e4aaec 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3152,6 +3152,15 @@ else
+@@ -3154,6 +3154,15 @@ else
      RUBY_LIB_VERSION="\"${ruby_version}\""
  fi
  
@@ -42,7 +42,7 @@ index db3641b..8e4aaec 100644
  AC_ARG_WITH(sitedir,
  	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
              [sitedir=$withval],
-@@ -3174,16 +3183,25 @@ if test "${LOAD_RELATIVE+set}"; then
+@@ -3176,16 +3185,25 @@ if test "${LOAD_RELATIVE+set}"; then
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
      RUBY_EXEC_PREFIX=""
      RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
@@ -68,7 +68,7 @@ index db3641b..8e4aaec 100644
  AS_CASE(["$RUBY_SITE_LIB_PATH"],
    ["$RUBY_LIB_PREFIX/"*], [
      RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"'
-@@ -3214,6 +3232,7 @@ else
+@@ -3216,6 +3234,7 @@ else
  fi
  AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
  AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX} !<verconf>!)
@@ -76,7 +76,7 @@ index db3641b..8e4aaec 100644
  if test "x$SITE_DIR" = xno; then
      AC_DEFINE(NO_RUBY_SITE_LIB, [] !<verconf>!)
  else
-@@ -3228,6 +3247,7 @@ fi
+@@ -3230,6 +3249,7 @@ fi
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
@@ -96,7 +96,7 @@ index d9e26c1..03c3332 100755
  File.foreach "config.status" do |line|
    next if /^#/ =~ line
    name = nil
-@@ -77,6 +78,7 @@ File.foreach "config.status" do |line|
+@@ -78,6 +79,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
-@@ -207,7 +209,7 @@ print(*v_fast)
+@@ -208,7 +210,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 397d760..ced4897 100644
--- a/ruby-1.9.3-custom-rubygems-location.patch
+++ b/ruby-1.9.3-custom-rubygems-location.patch
@@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
 index 748edc9..6a16745 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3197,6 +3197,13 @@ until VENDORARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDORARCH_D
+@@ -3199,6 +3199,13 @@ until VENDORARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDORARCH_D
      dir="${VENDORARCH_DIR}"
  done
  
@@ -29,7 +29,7 @@ index 748edc9..6a16745 100644
  if test "${LOAD_RELATIVE+set}"; then
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
      RUBY_EXEC_PREFIX=""
-@@ -3290,6 +3297,7 @@ AC_SUBST(sitedir)dnl
+@@ -3292,6 +3299,7 @@ AC_SUBST(sitedir)dnl
  AC_SUBST(sitearchdir)dnl
  AC_SUBST(vendordir)dnl
  AC_SUBST(vendorarchdir)dnl
@@ -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
-@@ -84,6 +84,7 @@ File.foreach "config.status" do |line|
+@@ -85,6 +85,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 79f7bd6..1b77ef4 100644
--- a/ruby-1.9.3-disable-versioned-paths.patch
+++ b/ruby-1.9.3-disable-versioned-paths.patch
@@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
 index f2d22ef..db3641b 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3319,6 +3319,17 @@ else
+@@ -3321,6 +3321,17 @@ else
  fi
  AC_SUBST(USE_RUBYGEMS)
  
@@ -61,7 +61,7 @@ index f9d97d3..d9e26c1 100755
  File.foreach "config.status" do |line|
    next if /^#/ =~ line
    name = nil
-@@ -138,6 +139,8 @@ File.foreach "config.status" do |line|
+@@ -139,6 +140,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/
-@@ -203,15 +206,15 @@ end
+@@ -204,15 +207,15 @@ end
  print(*v_fast)
  print(*v_others)
  print <<EOS
diff --git a/ruby.spec b/ruby.spec
index 8d95e3f..78482e4 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -17,7 +17,7 @@
 #%%global milestone preview2
 
 # Keep the revision enabled for pre-releases from SVN.
-%global revision 38260
+%global revision 38297
 
 %global ruby_archive %{name}-%{ruby_version}
 
diff --git a/rubygems-1.8.11-binary-extensions.patch b/rubygems-1.8.11-binary-extensions.patch
index dc6f85a..0377271 100644
--- a/rubygems-1.8.11-binary-extensions.patch
+++ b/rubygems-1.8.11-binary-extensions.patch
@@ -252,7 +252,7 @@ diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
 index 20b4198..6d8711f 100644
 --- a/lib/rubygems/defaults.rb
 +++ b/lib/rubygems/defaults.rb
-@@ -101,6 +101,17 @@ module Gem
+@@ -104,6 +104,17 @@ module Gem
    end
  
    ##