From 7b60ab093bc204baf0fa2c5ba9024204650247c0 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 12 Jan 2014 07:08:02 +0000 Subject: merge revision(s) 43587: [Backport #8623] * tool/rbinstall.rb (Gem::Specification#collect): make stable Gem::Specification.files in default .gemspecs the different order of "files" in .gemspec files makes them different therefore possibly conflicting in multilib scenario. patch by vo.x (Vit Ondruch) at [ruby-core:57544] [Bug #8623]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ tool/rbinstall.rb | 2 +- version.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d8b906326..12afcc0f1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Jan 12 16:07:52 2014 vo.x (Vit Ondruch) + + * tool/rbinstall.rb (Gem::Specification#collect): make stable + Gem::Specification.files in default .gemspecs the different order of + "files" in .gemspec files makes them different therefore possibly + conflicting in multilib scenario. patch by vo.x (Vit Ondruch) at + [ruby-core:57544] [Bug #8623]. + Sun Jan 12 16:01:54 2014 Tanaka Akira * test/openssl/test_cipher.rb (test_aes_gcm_wrong_tag): Don't use diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 5162498ecd..d463c18595 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -604,7 +604,7 @@ module RbInstall end def collect - ruby_libraries + built_libraries + (ruby_libraries + built_libraries).sort end private diff --git a/version.h b/version.h index f370c87603..d4b57ad3ba 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-01-12" -#define RUBY_PATCHLEVEL 381 +#define RUBY_PATCHLEVEL 382 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 1 -- cgit v1.2.3