rpms/ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Much better idea for Patch31 provided by Akira TAGOH <tagoh@redhat.com>

Browse Source
This commit is contained in:
Mamoru Tasaka 2009-10-14 15:24:31 +00:00
parent bbad66ed0a
commit abf129c49f
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ruby-1.8.6-p369-ri-gem_multipath.patch
View File

@ -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.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 @@ @@ -63,7 +63,7 @@
[ "--gems", nil, nil, [ "--gems", nil, nil,
"Include documentation from Rubygems:\n " + "Include documentation from Rubygems:\n " +
- (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" : - (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.") ], "No Rubygems ri found.") ],
[ "--format", "-f", "<name>", [ "--format", "-f", "<name>",
@ -23,33 +23,13 @@
directories = directories.join("\n ") 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.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 +++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb 2009-10-15 00:02:05.000000000 +0900
@@ -43,9 +43,14 @@ @@ -44,7 +44,7 @@
PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
begin begin
- require 'rubygems' require 'rubygems'
- GEMDIRS = Dir["#{Gem.path}/doc/*/ri"] - GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
- GEMDIRS.each { |path| RI::Paths::PATH << path } + GEMDIRS = Gem.path.map {|path| Dir["#{path}/doc/*/ri"]}.flatten
+ require 'rubygems' GEMDIRS.each { |path| RI::Paths::PATH << path }
+ gemdirs = []
+ Gem.path.each{ |gempath|
+ ripath = Dir["#{gempath}/doc/*/ri"]
+ ripath.each { |path| RI::Paths::PATH << path }
+ gemdirs << gempath
+ }
+ GEMDIRS = gemdirs
rescue LoadError rescue LoadError
GEMDIRS = nil 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

5
ruby.spec
View File

@ -16,7 +16,7 @@
Name: ruby Name: ruby
Version: %{rubyver}%{?dotpatchlevel} Version: %{rubyver}%{?dotpatchlevel}
Release: 4%{?dist} Release: 5%{?dist}
License: Ruby or GPLv2 License: Ruby or GPLv2
URL: http://www.ruby-lang.org/ URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -548,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT
%{_emacs_sitestartdir}/ruby-mode-init.el %{_emacs_sitestartdir}/ruby-mode-init.el
%changelog %changelog
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.6.369-5
- Much better idea for Patch31 provided by Akira TAGOH <tagoh@redhat.com>
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.6.369-4 * Wed Oct 14 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.6.369-4
- Fix the search path of ri command for ri manuals installed with gem - Fix the search path of ri command for ri manuals installed with gem
(bug 528787) (bug 528787)