Update to Ruby 2.3.2.
This commit is contained in:
Vít Ondruch
parent
5bf9dfde85
commit
327dc4e98f
@ -249,7 +249,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
|
||||
index 0428bea..b6e090e 100644
|
||||
--- a/test/rubygems/test_gem.rb
|
||||
+++ b/test/rubygems/test_gem.rb
|
||||
@@ -963,7 +963,8 @@ def test_self_use_paths
|
||||
@@ -962,7 +962,8 @@ def test_self_use_paths
|
||||
|
||||
def test_self_user_dir
|
||||
parts = [@userhome, '.gem', Gem.ruby_engine]
|
||||
@ -259,7 +259,7 @@ index 0428bea..b6e090e 100644
|
||||
|
||||
assert_equal File.join(parts), Gem.user_dir
|
||||
end
|
||||
@@ -1090,7 +1091,7 @@ def test_self_user_home_user_drive_and_path
|
||||
@@ -1089,7 +1090,7 @@ def test_self_user_home_user_drive_and_path
|
||||
def test_self_vendor_dir
|
||||
expected =
|
||||
File.join RbConfig::CONFIG['vendordir'], 'gems',
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 35568b41699ca1cd466fc8d23a84139b73ad0f1b Mon Sep 17 00:00:00 2001
|
||||
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
||||
Date: Tue, 19 Jan 2016 02:52:37 +0000
|
||||
Subject: [PATCH] increase timeout for ARMv7
|
||||
|
||||
http://rubyci.s3.amazonaws.com/scw-9d6766/ruby-trunk/log/20160113T091704Z.diff.html.gz
|
||||
|
||||
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
||||
---
|
||||
test/ruby/test_iseq.rb | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
|
||||
index 7af8c1b..4561eeb 100644
|
||||
--- a/test/ruby/test_iseq.rb
|
||||
+++ b/test/ruby/test_iseq.rb
|
||||
@@ -187,7 +187,7 @@ def test_safe_call_chain
|
||||
end
|
||||
|
||||
def test_parent_iseq_mark
|
||||
- assert_separately([], <<-'end;')
|
||||
+ assert_separately([], <<-'end;', timeout: 20)
|
||||
->{
|
||||
->{
|
||||
->{
|
||||
20
ruby.spec
20
ruby.spec
@ -1,6 +1,6 @@
|
||||
%global major_version 2
|
||||
%global minor_version 3
|
||||
%global teeny_version 1
|
||||
%global teeny_version 2
|
||||
%global major_minor_version %{major_version}.%{minor_version}
|
||||
|
||||
%global ruby_version %{major_minor_version}.%{teeny_version}
|
||||
@ -29,8 +29,8 @@
|
||||
%global rubygems_dir %{_datadir}/rubygems
|
||||
|
||||
# Bundled libraries versions
|
||||
%global rubygems_version 2.5.1
|
||||
%global molinillo_version 0.4.0
|
||||
%global rubygems_version 2.5.2
|
||||
%global molinillo_version 0.4.1
|
||||
|
||||
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
|
||||
# http://redmine.ruby-lang.org/issues/5313
|
||||
@ -40,9 +40,9 @@
|
||||
%global did_you_mean_version 1.0.0
|
||||
%global io_console_version 0.4.5
|
||||
%global json_version 1.8.3
|
||||
%global minitest_version 5.8.3
|
||||
%global minitest_version 5.8.5
|
||||
%global power_assert_version 0.2.6
|
||||
%global psych_version 2.0.17
|
||||
%global psych_version 2.1.0
|
||||
%global rake_version 10.4.2
|
||||
%global rdoc_version 4.2.1
|
||||
%global net_telnet_version 0.1.1
|
||||
@ -122,9 +122,6 @@ Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
|
||||
# Use miniruby to regenerate prelude.c.
|
||||
# https://bugs.ruby-lang.org/issues/10554
|
||||
Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch
|
||||
# Prevent test failures on ARM.
|
||||
# https://bugs.ruby-lang.org/issues/12331
|
||||
Patch8: ruby-2.4.0-increase-timeout-for-ARMv7.patch
|
||||
# Workaround "an invalid stdio handle" error on PPC, due to recently introduced
|
||||
# hardening features of glibc (rhbz#1361037).
|
||||
# https://bugs.ruby-lang.org/issues/12666
|
||||
@ -476,7 +473,6 @@ rm -rf ext/fiddle/libffi*
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
|
||||
# Provide an example of usage of the tapset:
|
||||
@ -537,7 +533,8 @@ for cert in \
|
||||
EntrustnetSecureServerCertificationAuthority.pem \
|
||||
GeoTrustGlobalCA.pem \
|
||||
AddTrustExternalCARoot.pem \
|
||||
AddTrustExternalCARoot-2048.pem
|
||||
AddTrustExternalCARoot-2048.pem \
|
||||
GlobalSignRootCA.pem
|
||||
do
|
||||
rm %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert
|
||||
done
|
||||
@ -963,7 +960,8 @@ make check TESTS="-v $DISABLE_TESTS"
|
||||
%{ruby_libdir}/tkextlib
|
||||
|
||||
%changelog
|
||||
* Fri Oct 21 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.1-60
|
||||
* Fri Nov 18 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.2-60
|
||||
- Update to Ruby 2.3.2.
|
||||
- Add gemspec_add_dep and gemspec_remove_dep macros.
|
||||
|
||||
* Wed Aug 10 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.1-58
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user