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

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch ruby.spec 
Log Message:
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-3
- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>


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

Index: ruby-1.8.6-p369-ri-gem_multipath.patch
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby-1.8.6-p369-ri-gem_multipath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ruby-1.8.6-p369-ri-gem_multipath.patch	13 Oct 2009 18:26:15 -0000	1.1
+++ ruby-1.8.6-p369-ri-gem_multipath.patch	14 Oct 2009 15:37:17 -0000	1.2
@@ -1,11 +1,11 @@
 --- 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
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 23:51:09.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) :
++          (RI::Paths::GEMDIRS ? Gem.path.map {|path| "#{path}/doc/*/ri" }.join(', ') :
                                  "No Rubygems ri found.") ],
                                                             
          [ "--format",       "-f",   "<name>",
@@ -23,33 +23,13 @@
          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)}
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-15 00:02:05.000000000 +0900
+@@ -44,7 +44,7 @@
  
      begin
--      require 'rubygems'
+       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
++      GEMDIRS = Gem.path.map {|path| Dir["#{path}/doc/*/ri"]}.flatten
+       GEMDIRS.each { |path| RI::Paths::PATH << path }
      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.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- ruby.spec	13 Oct 2009 18:26:15 -0000	1.137
+++ ruby.spec	14 Oct 2009 15:37:17 -0000	1.138
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -537,6 +537,9 @@ 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-3
+- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
+
 * 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)