rpms/ruby/F-11 ruby-1.8.6-p369-ri-gem_multipath.patch, NONE, 1.1 ruby.spec, 1.136, 1.137

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26508

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch 
Log Message:
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
- Fix the search path of ri command for ri manuals installed with gem
  (bug 528787)


ruby-1.8.6-p369-ri-gem_multipath.patch:
 ri_options.rb |    8 ++++++--
 ri_paths.rb   |   15 +++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE ruby-1.8.6-p369-ri-gem_multipath.patch ---
--- ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 01:08:42.000000000 +0900
@@ -63,7 +63,7 @@
 
         [ "--gems",         nil,    nil,
           "Include documentation from Rubygems:\n  " +
-          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
+          (RI::Paths::GEMDIRS ? ( tmppath=""; Gem.path.each {|path| tmppath += "#{path}/doc/*/ri "}; tmppath) :
                                 "No Rubygems ri found.") ],
                                                            
         [ "--format",       "-f",   "<name>",
@@ -136,7 +136,11 @@
           RI::Paths::HOMEDIR
         ]
 
-        directories << "#{Gem.path}/doc/*/ri" if RI::Paths::GEMDIRS
+        if RI::Paths::GEMDIRS
+          Gem.path.each {|gempath|
+            directories << "#{gempath}/doc/*/ri"
+          }
+        end
 
         directories = directories.join("\n    ")
 
--- ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-13 19:58:07.000000000 +0900
@@ -43,9 +43,14 @@
     PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
 
     begin
-      require 'rubygems'
-      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
-      GEMDIRS.each { |path| RI::Paths::PATH << path }
+      require 'rubygems'  
+      gemdirs = []
+      Gem.path.each{ |gempath| 
+         ripath = Dir["#{gempath}/doc/*/ri"]
+         ripath.each { |path| RI::Paths::PATH << path }
+         gemdirs << gempath
+      }
+      GEMDIRS = gemdirs
     rescue LoadError
       GEMDIRS = nil
     end
@@ -71,7 +76,9 @@
       path << RI::Paths::SYSDIR if use_system
       path << RI::Paths::SITEDIR if use_site
       path << RI::Paths::HOMEDIR if use_home
-      path << RI::Paths::GEMDIRS if use_gems
+      if use_gems
+         RI::Paths::GEMDIRS.each {|gemdirs| path << gemdirs }
+      end
 
       return path.flatten.compact
     end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- ruby.spec	23 Jun 2009 12:40:23 -0000	1.136
+++ ruby.spec	13 Oct 2009 18:26:15 -0000	1.137
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,7 @@ Patch26:        ruby-1.8.6-rexml-CVE-200
 Patch27:        ruby-1.8.6-p287-CVE-2008-5189.patch
 Patch28:        ruby-1.8.6-p287-remove-ssl-rand-range.patch
 Patch29:	ruby-always-use-i386.patch
+Patch31:	ruby-1.8.6-p369-ri-gem_multipath.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -173,6 +174,7 @@ pushd %{name}-%{arcver}
 %patch27 -p0
 %patch28 -p1
 %patch29 -p1
+%patch31 -p1
 popd
 
 %build
@@ -535,6 +537,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
+- Fix the search path of ri command for ri manuals installed with gem
+  (bug 528787)
+
 * Sat Jun 20 2009  Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.8.6.369-1
 - New patchlevel fixing CVE-2009-1904
 - Fix directory on ARM (#506233, Kedar Sovani)