rpms/ruby/F-11 ruby-1.8.6-p369-ri-gem_multipath.patch, 1.3, 1.4 ruby.spec, 1.139, 1.140
Mamoru Tasaka
mtasaka at fedoraproject.org
Fri Oct 23 17:37:44 UTC 2009
Author: mtasaka
Update of /cvs/extras/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26776
Modified Files:
ruby.spec
Added Files:
ruby-1.8.6-p369-ri-gem_multipath.patch
Log Message:
* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
- Restore the previous changes
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: ruby-1.8.6-p369-ri-gem_multipath.patch
diff -N ruby-1.8.6-p369-ri-gem_multipath.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ruby-1.8.6-p369-ri-gem_multipath.patch 23 Oct 2009 17:37:43 -0000 1.4
@@ -0,0 +1,35 @@
+--- 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 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 ? Gem.path.map {|path| "#{path}/doc/*/ri" }.join(', ') :
+ "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-15 00:02:05.000000000 +0900
+@@ -44,7 +44,7 @@
+
+ begin
+ require 'rubygems'
+- GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
++ GEMDIRS = Gem.path.map {|path| Dir["#{path}/doc/*/ri"]}.flatten
+ GEMDIRS.each { |path| RI::Paths::PATH << path }
+ rescue LoadError
+ GEMDIRS = nil
Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- ruby.spec 22 Oct 2009 15:34:22 -0000 1.139
+++ ruby.spec 23 Oct 2009 17:37:43 -0000 1.140
@@ -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,19 @@ rm -rf $RPM_BUILD_ROOT
%{_emacs_sitestartdir}/ruby-mode-init.el
%changelog
+* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
+- Restore the previous changes
+
+* Sat Oct 24 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.8.6.383-1
+- Update to 1.8.6 patchlevel 383 (bug 520063)
+
+* 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)
+
* 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)
More information about the fedora-extras-commits
mailing list