[ruby/private-ruby-2.2] Upgrade to Ruby 2.2.0 (r47902).
Vít Ondruch
vondruch at fedoraproject.org
Tue Oct 14 09:11:30 UTC 2014
commit 37788299d5bfc785afbc4832315d0f18a53003f4
Author: Vít Ondruch <vondruch at redhat.com>
Date: Tue Oct 14 09:53:50 2014 +0200
Upgrade to Ruby 2.2.0 (r47902).
ruby-1.9.3-mkmf-verbose.patch | 2 +-
...ecify-additional-preludes-by-configuratio.patch | 4 +-
...-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 | 6 +-
...Support-earlier-rubyies-following-0a8b54d.patch | 57 --------------------
ruby.spec | 19 ++-----
8 files changed, 16 insertions(+), 82 deletions(-)
---
diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch
index eb33679..13148ce 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 682eb46..e6b1445 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
-@@ -1842,7 +1842,7 @@ SRC
+@@ -1858,7 +1858,7 @@ SRC
SHELL = /bin/sh
# V=0 quiet, V=1 verbose. other values don't work.
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 4df3eeb..21489ec 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
@@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk
index 5cfbc3d..3f0a82e 100644
--- a/common.mk
+++ b/common.mk
-@@ -111,7 +111,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT)
+@@ -113,7 +113,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT)
GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
DEFAULT_PRELUDES = $(GEM_PRELUDE)
@@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in
index 0e371e2..d4f1dcb 100644
--- a/configure.in
+++ b/configure.in
-@@ -4078,6 +4078,13 @@ AC_SUBST(rubyarchhdrdir)dnl
+@@ -4103,6 +4103,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 c20b24e..c871b7e 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
-@@ -3301,6 +3301,11 @@ if test ${multiarch+set}; then
+@@ -3325,6 +3325,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 ea19698..700b5a2 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
-@@ -3885,8 +3885,6 @@ AS_CASE(["$target_os"],
+@@ -3909,8 +3909,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,
-@@ -3916,6 +3914,7 @@ AC_ARG_WITH(ruby-version,
+@@ -3940,6 +3938,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 */'])
-@@ -3932,30 +3931,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
+@@ -3956,30 +3955,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 3a83179..9b7d60a 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
-@@ -3997,6 +3997,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -4021,6 +4021,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 b807a8c..ea40c40 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
-@@ -3971,6 +3971,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -3995,6 +3995,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=''
-@@ -3994,6 +3998,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -4018,6 +4022,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl
@@ -90,7 +90,7 @@ index b47b6e1..0b99408 100755
+ end
end
- install?(:local, :arch, :lib) do
+ install?(:local, :comm, :hdr, :'comm-hdr') do
--
1.8.3.1
diff --git a/ruby.spec b/ruby.spec
index a28418c..c6071b5 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -10,7 +10,7 @@
#%%global milestone preview2
# Keep the revision enabled for pre-releases from SVN.
-%global revision 47594
+%global revision 47902
%global ruby_archive %{name}-%{ruby_version}
@@ -24,7 +24,7 @@
%global release 24
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
-%global rubygems_version 2.4.1
+%global rubygems_version 2.4.2
# The RubyGems library has to stay out of Ruby directory three, since the
# RubyGems should be share by all Ruby implementations.
@@ -38,7 +38,7 @@
%global io_console_version 0.4.2
%global json_version 1.8.1
%global minitest_version 5.4.1
-%global power_assert_version 0.1.3
+%global power_assert_version 0.1.4
%global psych_version 2.0.6
%global rake_version 10.3.2
%global rdoc_version 4.2.0.alpha
@@ -105,9 +105,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
-# Prevents 'make install' error during installation of bundled gems.
-# https://github.com/rubygems/rubygems/issues/1013
-Patch7: ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ruby(rubygems) >= %{rubygems_version}
@@ -400,7 +397,6 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# Provide an example of usage of the tapset:
cp -a %{SOURCE3} .
@@ -590,11 +586,6 @@ touch abrt.rb
sed -i '/assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))/i \
next if /wrap/ =~ name' test/openssl/test_cipher.rb
-# Disable failing TestTimeTZ#test_gen_Europe_Lisbon_111 for now. Lest blame
-# tzdata-2014g-1.fc22 for now, since it works with older versions.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1141775
-sed -i '/^Europe\/Lisbon/ s/^/#/' test/ruby/test_time_tz.rb
-
make check TESTS="-v $DISABLE_TESTS"
%post libs -p /sbin/ldconfig
@@ -886,8 +877,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
-* Wed Aug 27 2014 Vít Ondruch <vondruch at redhat.com> - 2.2.0-0.24.r47594
-- Upgrade to Ruby 2.2.0 (r47594).
+* Tue Oct 14 2014 Vít Ondruch <vondruch at redhat.com> - 2.2.0-0.24.r47902
+- Upgrade to Ruby 2.2.0 (r47902).
- Explicitly list RubyGems directories to avoid accidentaly packaged content.
- Split test-unit and power_assert gems into separate sub-packages.
More information about the scm-commits
mailing list