[ruby/f17] Update to Ruby 1.9.3-p194.
Vít Ondruch
vondruch at fedoraproject.org
Fri Apr 20 14:28:07 UTC 2012
commit f4336c39278050dcf1db6c56f36e917d4e24ae03
Author: Vít Ondruch <vondruch at redhat.com>
Date: Fri Apr 20 16:27:56 2012 +0200
Update to Ruby 1.9.3-p194.
.gitignore | 1 +
ruby-1.9.3-added-site-and-vendor-arch-flags.patch | 10 ++--
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-1.9.3-fix-json-parser.patch | 40 --------------
ruby-1.9.3-prevent-optimizing-sp.patch | 53 -------------------
ruby.spec | 58 ++++++++++-----------
sources | 2 +-
10 files changed, 42 insertions(+), 138 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 03a0175..5063de6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz
/ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz
/ruby-1.8.7-p357.tar.bz2
/ruby-1.9.3-p0.tar.gz
+/ruby-1.9.3-p194.tar.gz
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 9dff272..1363063 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 83e5d76..31532bd 100644
--- a/configure.in
+++ b/configure.in
-@@ -2801,6 +2801,15 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
+@@ -2811,6 +2811,15 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
dir="${SITE_DIR}"
done
@@ -45,7 +45,7 @@ index 83e5d76..31532bd 100644
AC_ARG_WITH(vendordir,
AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]]]),
[vendordir=$withval],
-@@ -2810,19 +2819,32 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
+@@ -2820,19 +2829,32 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
dir="${VENDOR_DIR}"
done
@@ -78,7 +78,7 @@ index 83e5d76..31532bd 100644
fi
pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)'
-@@ -2840,6 +2862,13 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"],
+@@ -2850,6 +2872,13 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"],
[
RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\""
])
@@ -92,7 +92,7 @@ index 83e5d76..31532bd 100644
AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
["$RUBY_LIB_PREFIX/"*], [
RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"'
-@@ -2847,6 +2876,13 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
+@@ -2857,6 +2886,13 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
[
RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\""
])
@@ -106,7 +106,7 @@ index 83e5d76..31532bd 100644
pat=`echo "$RUBY_EXEC_PREFIX/" | tr -c '\012' .`'\(.*\)'
AS_CASE(["$RUBY_LIB_PREFIX"],
["$RUBY_EXEC_PREFIX/"*], [
-@@ -2868,19 +2904,23 @@ if test "x$SITE_DIR" = xno; then
+@@ -2878,19 +2914,23 @@ if test "x$SITE_DIR" = xno; then
AC_DEFINE(NO_RUBY_SITE_LIB)
else
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH})
diff --git a/ruby-1.9.3-always-use-i386.patch b/ruby-1.9.3-always-use-i386.patch
index 734c5eb..f5a8c3d 100644
--- a/ruby-1.9.3-always-use-i386.patch
+++ b/ruby-1.9.3-always-use-i386.patch
@@ -1,6 +1,6 @@
--- a/configure.in.orig 2011-10-18 08:56:21.587594685 +0200
+++ b/configure.in 2011-10-18 08:56:59.751593321 +0200
-@@ -2925,6 +2925,8 @@
+@@ -2935,6 +2935,8 @@
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 b8feb96..8440ea7 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 83e5d76..e6dc38c 100644
--- a/configure.in
+++ b/configure.in
-@@ -2783,6 +2783,15 @@ else
+@@ -2793,6 +2793,15 @@ else
RUBY_LIB_VERSION="\"${ruby_version}\""
fi
@@ -42,7 +42,7 @@ index 83e5d76..e6dc38c 100644
AC_ARG_WITH(sitedir,
AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]]]),
[sitedir=$withval],
-@@ -2805,16 +2814,25 @@ if test "${LOAD_RELATIVE+set}"; then
+@@ -2815,16 +2824,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 83e5d76..e6dc38c 100644
AS_CASE(["$RUBY_SITE_LIB_PATH"],
["$RUBY_LIB_PREFIX/"*], [
RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"'
-@@ -2845,6 +2863,7 @@ else
+@@ -2855,6 +2873,7 @@ else
fi
AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX})
@@ -76,7 +76,7 @@ index 83e5d76..e6dc38c 100644
if test "x$SITE_DIR" = xno; then
AC_DEFINE(NO_RUBY_SITE_LIB)
else
-@@ -2859,6 +2878,7 @@ fi
+@@ -2869,6 +2888,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 2566ef6..62d3dad 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 b1bc951..91c5d0d 100644
--- a/configure.in
+++ b/configure.in
-@@ -2828,6 +2828,13 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
+@@ -2838,6 +2838,13 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
dir="${VENDORARCH_DIR}"
done
@@ -29,7 +29,7 @@ index b1bc951..91c5d0d 100644
if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX=""
-@@ -2921,6 +2928,7 @@ AC_SUBST(sitearch)dnl
+@@ -2931,6 +2938,7 @@ AC_SUBST(sitearch)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 afafb04..6d0c5e1 100644
--- a/ruby-1.9.3-disable-versioned-paths.patch
+++ b/ruby-1.9.3-disable-versioned-paths.patch
@@ -13,7 +13,7 @@ diff --git a/configure.in b/configure.in
index e742e74..86cb68f 100644
--- a/configure.in
+++ b/configure.in
-@@ -2953,6 +2953,17 @@ else
+@@ -2963,6 +2963,17 @@ else
fi
AC_SUBST(USE_RUBYGEMS)
diff --git a/ruby.spec b/ruby.spec
index b0facbd..9fc8225 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,7 +1,7 @@
%global major_version 1
%global minor_version 9
%global teeny_version 3
-%global patch_level 0
+%global patch_level 194
%global major_minor_version %{major_version}.%{minor_version}
@@ -25,7 +25,7 @@
%global ruby_vendorlibdir %{_datadir}/ruby/%{ruby_vendordir}
%global ruby_vendorarchdir %{_libdir}/ruby/%{ruby_vendordir}
-%global rubygems_version 1.8.11
+%global rubygems_version 1.8.23
# The RubyGems library has to stay out of Ruby directory three, since the
# RubyGems should be share by all Ruby implementations.
@@ -51,7 +51,7 @@
Summary: An interpreter of object-oriented scripting language
Name: ruby
Version: %{ruby_version_patch_level}
-Release: 9%{?dist}
+Release: 1%{?dist}
Group: Development/Languages
License: Ruby or BSD
URL: http://ruby-lang.org/
@@ -83,12 +83,6 @@ Patch8: ruby-1.9.3-custom-rubygems-location.patch
# Add support for installing binary extensions according to FHS.
# https://github.com/rubygems/rubygems/issues/210
Patch9: rubygems-1.8.11-binary-extensions.patch
-# Fixes segfaults when build with GCC 4.7.
-# http://bugs.ruby-lang.org/issues/5851
-Patch10: ruby-1.9.3-prevent-optimizing-sp.patch
-# Fixes json encoding failures when build with GCC 4.7.
-# http://bugs.ruby-lang.org/issues/5888
-Patch11: ruby-1.9.3-fix-json-parser.patch
# Make mkmf verbose by default
Patch12: ruby-1.9.3-mkmf-verbose.patch
@@ -316,8 +310,6 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10
-%patch11 -p1
%patch12 -p1
%build
@@ -413,35 +405,33 @@ mv %{buildroot}%{ruby_libdir}/minitest %{buildroot}%{gem_dir}/gems/minitest-%{mi
# Adjust the gemspec files so that the gems will load properly
sed -i '2 a\
- s.require_paths = ["lib"]' %{buildroot}/%{gem_dir}/specifications/rake-%{rake_version}.gemspec
+ s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/rake-%{rake_version}.gemspec
sed -i '2 a\
- s.require_paths = ["lib"]' %{buildroot}/%{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
+ s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
-sed -i -e '2 a\
- s.require_paths = ["lib"]' -e '3 a\
- s.extensions = ["bigdecimal.so"]' %{buildroot}/%{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
+sed -i '2 a\
+ s.require_paths = ["lib"]\
+ s.extensions = ["bigdecimal.so"]' %{buildroot}%{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
-sed -i -e '2 a\
- s.require_paths = ["lib"]' -e '3 a\
- s.extensions = ["io/console.so"]' %{buildroot}/%{gem_dir}/specifications/io-console-%{io_console_version}.gemspec
+sed -i '2 a\
+ s.require_paths = ["lib"]\
+ s.extensions = ["io/console.so"]' %{buildroot}%{gem_dir}/specifications/io-console-%{io_console_version}.gemspec
-sed -i -e '2 a\
- s.require_paths = ["lib"]' -e '3 a\
- s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}/%{gem_dir}/specifications/json-%{json_version}.gemspec
+sed -i '2 a\
+ s.require_paths = ["lib"]\
+ s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}%{gem_dir}/specifications/json-%{json_version}.gemspec
sed -i '2 a\
- s.require_paths = ["lib"]' %{buildroot}/%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
+ s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
%check
# Disable make check on ARM until the bug is fixed
# https://bugzilla.redhat.com/show_bug.cgi?id=789410
# https://bugs.ruby-lang.org/issues/6011
-# likewise on ppc(64), RH bugzilla 803698
+# same for ppc(64), RH bugzilla #803698
%ifnarch %{arm} ppc ppc64
-# TODO: Investigate the test failures.
-# https://bugs.ruby-lang.org/issues/6036
-make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x test_x509cert.rb"
+make check TESTS="-v"
%endif
%post libs -p /sbin/ldconfig
@@ -480,7 +470,7 @@ make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x t
%{_includedir}/*
%{_libdir}/libruby.so
-%{_libdir}/pkgconfig/ruby-1.9.pc
+%{_libdir}/pkgconfig/ruby-%{major_minor_version}.pc
%files libs
%doc COPYING
@@ -708,12 +698,18 @@ make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x t
%{ruby_libdir}/tkextlib
%changelog
-* Thu Mar 15 2012 Karsten Hopp <karsten at redhat.com> 1.9.3.0-9
-- disable make check on ppc(64), RHBZ 803698
+* Fri Apr 20 2012 Vít Ondruch <vondruch at redhat.com> - 1.9.3.194-1
+- Update to Ruby 1.9.3-p194.
-* Wed Feb 29 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.9.3.0-8
+* Mon Apr 09 2012 Karsten Hopp <karsten at redhat.com> 1.9.3.125-3
+- disable check on ppc(64), RH bugzilla 803698
+
+* Wed Feb 29 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.9.3.125-2
- Temporarily disable make check on ARM until it's fixed upstream. Tracked in RHBZ 789410
+* Mon Feb 20 2012 Vít Ondruch <vondruch at redhat.com> - 1.9.3.125-1
+- Upgrade to Ruby 1.9.3-p125.
+
* Sun Jan 29 2012 Mamoru Tasaka <mtasaka at fedoraprpject.org> - 1.9.3.0-7
- Make mkmf.rb verbose by default
diff --git a/sources b/sources
index e874ffe..391168d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e2fef56185cfbaf29d0c8329fc77c05 ruby-1.9.3-p0.tar.gz
+bc0c715c69da4d1d8bd57069c19f6c0e ruby-1.9.3-p194.tar.gz
More information about the scm-commits
mailing list