[ruby/private-ruby-2.2] Upgrade to Ruby 2.2.0.
Vít Ondruch
vondruch at fedoraproject.org
Fri Jan 2 15:35:24 UTC 2015
commit 1bc3d3a4ec7a4873380c24974e79df9a29e1d872
Author: Vít Ondruch <vondruch at redhat.com>
Date: Fri Jan 2 16:35:22 2015 +0100
Upgrade to Ruby 2.2.0.
...ecify-additional-preludes-by-configuratio.patch | 2 +-
...-2.1.0-Enable-configuration-of-archlibdir.patch | 2 +-
...licated-paths-when-empty-version-string-i.patch | 6 +++---
ruby-2.1.0-always-use-i386.patch | 2 +-
ruby-2.1.0-custom-rubygems-location.patch | 4 ++--
ruby-2.2.0-Extend-weak-ref-test-timeout.patch | 13 -------------
ruby.spec | 15 +++++----------
7 files changed, 13 insertions(+), 31 deletions(-)
---
diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
index d0e53c6..b30ad4f 100644
--- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
+++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
@@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in
index 0e371e2..d4f1dcb 100644
--- a/configure.in
+++ b/configure.in
-@@ -4156,6 +4156,13 @@ AC_SUBST(rubyarchhdrdir)dnl
+@@ -4160,6 +4160,13 @@ AC_SUBST(rubyarchhdrdir)dnl
AC_SUBST(sitearchhdrdir)dnl
AC_SUBST(vendorarchhdrdir)dnl
diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
index 7370052..6863f07 100644
--- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
@@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
index 37d9a62..553d4d0 100644
--- a/configure.in
+++ b/configure.in
-@@ -3378,6 +3378,11 @@ if test ${multiarch+set}; then
+@@ -3379,6 +3379,11 @@ if test ${multiarch+set}; then
fi
archlibdir='${libdir}/${arch}'
diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
index 73c16d4..570d4d7 100644
--- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
@@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in
index 17ed3ed..5843651 100644
--- a/configure.in
+++ b/configure.in
-@@ -3962,8 +3962,6 @@ AS_CASE(["$target_os"],
+@@ -3966,8 +3966,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
@@ -23,7 +23,7 @@ index 17ed3ed..5843651 100644
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix,
-@@ -3993,6 +3991,7 @@ AC_ARG_WITH(ruby-version,
+@@ -3997,6 +3995,7 @@ AC_ARG_WITH(ruby-version,
[ruby_version=full])
unset RUBY_LIB_VERSION
unset RUBY_LIB_VERSION_STYLE
@@ -31,7 +31,7 @@ index 17ed3ed..5843651 100644
AS_CASE(["$ruby_version"],
[full], [RUBY_LIB_VERSION_STYLE='3 /* full */'],
[minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'])
-@@ -4009,30 +4008,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
+@@ -4013,30 +4012,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
eval $ruby_version
elif test -z "${ruby_version}"; then
diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch
index ad0a203..210adb1 100644
--- a/ruby-2.1.0-always-use-i386.patch
+++ b/ruby-2.1.0-always-use-i386.patch
@@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
index 553d4d0..03a4152 100644
--- a/configure.in
+++ b/configure.in
-@@ -4074,6 +4074,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -4078,6 +4078,8 @@ AC_SUBST(vendorarchdir)dnl
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch
index e467d3b..41de23f 100644
--- a/ruby-2.1.0-custom-rubygems-location.patch
+++ b/ruby-2.1.0-custom-rubygems-location.patch
@@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
index 03a4152..0e371e2 100644
--- a/configure.in
+++ b/configure.in
-@@ -4048,6 +4048,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -4052,6 +4052,10 @@ AC_ARG_WITH(vendorarchdir,
[vendorarchdir=$withval],
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
@@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644
if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX=''
-@@ -4071,6 +4075,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -4075,6 +4079,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl
diff --git a/ruby.spec b/ruby.spec
index 637c3ed..5335c98 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 48899
+#%%global revision 48936
%global ruby_archive %{name}-%{ruby_version}
@@ -107,9 +107,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 TestWeakRef#test_repeated_object_leak failure on ARM.
-# https://bugs.ruby-lang.org/issues/10618
-Patch8: ruby-2.2.0-Extend-weak-ref-test-timeout.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ruby(rubygems) >= %{rubygems_version}
@@ -172,6 +169,8 @@ Group: Development/Libraries
License: Ruby or MIT
Requires: ruby(release)
Requires: rubygem(rdoc) >= %{rdoc_version}
+# TODO: This seems to be optional now.
+# https://github.com/rubygems/rubygems/commit/68da16dd7508c5c4010bfe32f99422568d3d582f
Requires: rubygem(io-console) >= %{io_console_version}
Requires: rubygem(psych) >= %{psych_version}
Provides: gem = %{version}-%{release}
@@ -404,7 +403,6 @@ rm -rf ext/psych/yaml
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch8 -p1
# Provide an example of usage of the tapset:
cp -a %{SOURCE3} .
@@ -440,9 +438,6 @@ autoconf
# Avoid regeneration of prelude.c due to patch6 applied to common.mk.
# https://bugs.ruby-lang.org/issues/10554
-# TODO: Alternative solution might be to remove the path6 entirely and go
-# ahead with the following proposal:
-# https://bugs.ruby-lang.org/issues/8566#note-3
touch prelude.c
# Q= makes the build output more verbose and allows to check Fedora
@@ -884,8 +879,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
-* Mon Nov 10 2014 Vít Ondruch <vondruch at redhat.com> - 2.2.0-0.1.r48899
-- Upgrade to Ruby 2.2.0 (r48899).
+* Fri Jan 02 2015 Vít Ondruch <vondruch at redhat.com> - 2.2.0-1
+- Upgrade to Ruby 2.2.0.
- Explicitly list RubyGems directories to avoid accidentaly packaged content.
- Split test-unit and power_assert gems into separate sub-packages.
- Drop libdb dependency in favor of gdbm.
More information about the scm-commits
mailing list