merges r29200 from trunk into ruby_1_9_2, but also leaves the old

files without suffixed.
--
* tool/rbinstall.rb (install?): gemspec filename should include
  its version. patched by Luis Lavena [ruby-core:32165]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 17 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index a4d1cf1bfc..1138faea69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep  9 09:02:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/rbinstall.rb (install?): gemspec filename should include
+	  its version. patched by Luis Lavena [ruby-core:32165]
+
 Mon Sep  6 11:03:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* Fixed wrong check of missing functions. Patch by Adrian Quark.
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index f5586fe1f0..ffac2bf031 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -513,15 +513,22 @@ install?(:ext, :comm, :gem) do
     version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
     version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2]
     puts "#{" "*30}#{name} #{version}"
-    open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) do
-      <<-GEMSPEC
+    gemspec = <<-GEMSPEC
 Gem::Specification.new do |s|
   s.name = #{name.dump}
   s.version = #{version.dump}
   s.summary = "This #{name} is bundled with Ruby"
 end
-      GEMSPEC
-    end
+    GEMSPEC
+    open_for_install(File.join(destdir, "#{name}-#{version}.gemspec"), $data_mode) { gemspec }
+    open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) {
+      <<-WARNING + gemspec
+# #{name}.gemspec remains just for compatibility with installation
+# before Ruby 1.9.2-p32.
+# This file will no longer exist in Ruby 1.9.3.
+# Refer #{name}-#{version}.gemspec instead.
+      WARNING
+    }
   end
 end
 
diff --git a/version.h b/version.h
index 1fa21d4544..a6c9b0fb2c 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 32
+#define RUBY_PATCHLEVEL 33
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1