summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-09 00:17:11 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-09 00:17:11 +0000
commit4d2787c67b84542c6fcce4370c3f41f9a644bbb0 (patch)
tree13c39a55105c3e428470933288310fc567dc2084
parent0787deb64c3f718b543c381546d0d6f4d4be85f6 (diff)
* 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/trunk@29200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/rbinstall.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8570cbd966..91641a7e5e 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]
+
Wed Sep 8 22:46:31 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 266d717fab..0e9f39adbb 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -515,7 +515,7 @@ 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
+ open_for_install(File.join(destdir, "#{name}-#{version}.gemspec"), $data_mode) do
<<-GEMSPEC
Gem::Specification.new do |s|
s.name = #{name.dump}