[ruby] Update to Ruby 2.0.0 (r38422).
Vít Ondruch
vondruch at fedoraproject.org
Fri Feb 22 14:23:06 UTC 2013
commit 66b98259c5d7952c9594f748d70cb743f1e29f3d
Author: Vít Ondruch <vondruch at redhat.com>
Date: Mon Dec 17 10:52:59 2012 +0100
Update to Ruby 2.0.0 (r38422).
ruby-1.9.3-added-site-and-vendor-arch-flags.patch | 12 ++++++------
ruby-1.9.3-always-use-i386.patch | 2 +-
ruby-1.9.3-arch-specific-dir.patch | 8 ++++----
ruby-1.9.3-custom-rubygems-location.patch | 4 ++--
ruby-1.9.3-disable-versioned-paths.patch | 2 +-
ruby.spec | 6 +++---
rubygems-1.8.11-binary-extensions.patch | 2 +-
7 files changed, 18 insertions(+), 18 deletions(-)
---
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 4ec996a..4900fee 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
-@@ -3172,6 +3172,15 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
+@@ -3178,6 +3178,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],
-@@ -3181,19 +3190,32 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
+@@ -3187,19 +3196,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' .`'\(.*\)'
-@@ -3211,6 +3233,13 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"],
+@@ -3217,6 +3239,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\"`"'"'
-@@ -3218,6 +3247,13 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
+@@ -3224,6 +3253,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/"*], [
-@@ -3239,11 +3275,13 @@ if test "x$SITE_DIR" = xno; then
+@@ -3245,11 +3281,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
-@@ -3251,7 +3289,9 @@ AC_SUBST(sitearch)dnl
+@@ -3257,7 +3295,9 @@ AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
AC_SUBST(archdir)dnl
AC_SUBST(sitedir)dnl
diff --git a/ruby-1.9.3-always-use-i386.patch b/ruby-1.9.3-always-use-i386.patch
index ae98ef5..3c4eff8 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
-@@ -3296,6 +3296,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -3302,6 +3302,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 e1f025d..1e5bc06 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
-@@ -3154,6 +3154,15 @@ else
+@@ -3160,6 +3160,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],
-@@ -3176,16 +3185,25 @@ if test "${LOAD_RELATIVE+set}"; then
+@@ -3182,16 +3191,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\"`"'"'
-@@ -3216,6 +3234,7 @@ else
+@@ -3222,6 +3240,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
-@@ -3230,6 +3249,7 @@ fi
+@@ -3236,6 +3255,7 @@ fi
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
diff --git a/ruby-1.9.3-custom-rubygems-location.patch b/ruby-1.9.3-custom-rubygems-location.patch
index ced4897..054b31f 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
-@@ -3199,6 +3199,13 @@ until VENDORARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDORARCH_D
+@@ -3205,6 +3205,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=""
-@@ -3292,6 +3299,7 @@ AC_SUBST(sitedir)dnl
+@@ -3298,6 +3305,7 @@ AC_SUBST(sitedir)dnl
AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorarchdir)dnl
diff --git a/ruby-1.9.3-disable-versioned-paths.patch b/ruby-1.9.3-disable-versioned-paths.patch
index 1b77ef4..32f7e99 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
-@@ -3321,6 +3321,17 @@ else
+@@ -3327,6 +3327,17 @@ else
fi
AC_SUBST(USE_RUBYGEMS)
diff --git a/ruby.spec b/ruby.spec
index fbd0c05..0d9c2ec 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 38297
+%global revision 38422
%global ruby_archive %{name}-%{ruby_version}
@@ -63,10 +63,10 @@
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
# http://redmine.ruby-lang.org/issues/5313
%global irb_version %{ruby_version_patch_level}
-%global rdoc_version 4.0.0.preview2
+%global rdoc_version 4.0.0.preview2.1
%global bigdecimal_version 1.1.0
%global io_console_version 0.3
-%global json_version 1.7.1
+%global json_version 1.7.5
%global minitest_version 4.3.2
%global psych_version 2.0.0
diff --git a/rubygems-1.8.11-binary-extensions.patch b/rubygems-1.8.11-binary-extensions.patch
index 0377271..dc6f85a 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
-@@ -104,6 +104,17 @@ module Gem
+@@ -101,6 +101,17 @@ module Gem
end
##
More information about the scm-commits
mailing list