merge rpm-5.4.9-ruby1.9-fixes.patch into gem_helper.rb

diff --git a/gem_helper.rb b/gem_helper.rb
index 65f45e431def207aab1c29e08098ae3d36a56dc9..feea121af50c028beb44336ad71689f2de5fc1d3 100755 (executable)
--- a/gem_helper.rb
+++ b/gem_helper.rb
@@ -58,10 +58,13 @@ if ARGV[0] == "build" or ARGV[0] == "install" or ARGV[0] == "spec"
     argv.delete_at(0)
   end
 
-  file_data = Zlib::GzipReader.open("metadata.gz")
+  file_data = Zlib::GzipReader.open("metadata.gz") {|io| io.read}
   header = YAML::load(file_data)
-  file_data.close()
-  body = header.instance_variable_get :@ivars
+  body = {}
+  # I don't know any better.. :/
+  header.instance_variables.each do |iv|
+         body[iv.to_s.gsub(/^@/,'')] = header.instance_variable_get(iv)
+  end
 
   spec = Gem::Specification.from_yaml(YAML.dump(header))
 

diff --git a/rpm-5.4.9-ruby1.9-fixes.patch b/rpm-5.4.9-ruby1.9-fixes.patch
index b6e24af13c66319133886557fe5ca29d7c857368..07748fd1ae4ce37cedeae5026c7231d96a8ff3e3 100644 (file)
--- a/rpm-5.4.9-ruby1.9-fixes.patch
+++ b/rpm-5.4.9-ruby1.9-fixes.patch
@@ -40,23 +40,3 @@ diff -urN rpm-5.4.9/macros/ruby.in rpm-5.4.9-patched/macros/ruby.in
  
  %__gem_helper %{_usrlibrpm}/gem_helper.rb
  
-diff -urN rpm-5.4.9/scripts/gem_helper.rb rpm-5.4.9-patched/scripts/gem_helper.rb
---- rpm-5.4.9/scripts/gem_helper.rb    2010-10-16 20:58:48.000000000 +1100
-+++ rpm-5.4.9-patched/scripts/gem_helper.rb    2012-08-30 18:12:11.233007114 +1100
-@@ -57,10 +57,13 @@
-     argv.delete_at(0)
-   end
- 
--  file_data = Zlib::GzipReader.open("metadata.gz")
-+  file_data = Zlib::GzipReader.open("metadata.gz") {|io| io.read}
-   header = YAML::load(file_data)
--  file_data.close()
--  body = header.instance_variable_get :@ivars
-+  body = {}
-+  # I don't know any better.. :/
-+  header.instance_variables.each do |iv|
-+        body[iv.to_s.gsub(/^@/,'')] = header.instance_variable_get(iv)
-+  end
- 
-   require 'rubygems'
-   spec = Gem::Specification.from_yaml(YAML.dump(header))