nagachika	2014-01-12 16:08:02 +0900 (Sun, 12 Jan 2014)

  New Revision: 44567

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44567

  Log:
    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].

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/tool/rbinstall.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44566)
+++ ruby_2_0_0/ChangeLog	(revision 44567)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jan 12 16:07:52 2014  vo.x (Vit Ondruch)  <vondruch@r...>
+
+	* 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  <akr@f...>
 
 	* test/openssl/test_cipher.rb (test_aes_gcm_wrong_tag): Don't use
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44566)
+++ ruby_2_0_0/version.h	(revision 44567)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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
Index: ruby_2_0_0/tool/rbinstall.rb
===================================================================
--- ruby_2_0_0/tool/rbinstall.rb	(revision 44566)
+++ ruby_2_0_0/tool/rbinstall.rb	(revision 44567)
@@ -604,7 +604,7 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/rbinstall.rb#L604
       end
 
       def collect
-        ruby_libraries + built_libraries
+        (ruby_libraries + built_libraries).sort
       end
 
       private

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43587


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/