[rubygems/f19] Add extension directory also to WhichCommand::gem_paths (bug 1051169)

Mamoru TASAKA mtasaka at fedoraproject.org
Wed Jan 15 04:10:45 UTC 2014


commit dedb72fe8e59d06a042de502105a2639325f4066
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Wed Jan 15 13:10:52 2014 +0900

    Add extension directory also to WhichCommand::gem_paths (bug 1051169)

 rubygems-2.0.0-binary-extensions.patch |   31 +++++++++++++++++++++++++++++++
 rubygems.spec                          |    5 ++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/rubygems-2.0.0-binary-extensions.patch b/rubygems-2.0.0-binary-extensions.patch
index 91b570e..1c0a0a6 100644
--- a/rubygems-2.0.0-binary-extensions.patch
+++ b/rubygems-2.0.0-binary-extensions.patch
@@ -342,3 +342,34 @@ index e1577fc..1492c68 100644
 -- 
 1.8.1.2
 
+From be1b7b8b6f1795e5a45901d7cfa924951be5c0cb Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Wed, 15 Jan 2014 13:08:39 +0900
+Subject: [PATCH 8/8] Add extension directory also to WhichCommand::gem_paths
+
+---
+ lib/rubygems/commands/which_command.rb | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/lib/rubygems/commands/which_command.rb b/lib/rubygems/commands/which_command.rb
+index 6495278..ae7c29f 100644
+--- a/lib/rubygems/commands/which_command.rb
++++ b/lib/rubygems/commands/which_command.rb
+@@ -71,7 +71,13 @@ class Gem::Commands::WhichCommand < Gem::Command
+   end
+ 
+   def gem_paths(spec)
+-    spec.require_paths.collect { |d| File.join spec.full_gem_path, d }
++    ret = []
++    spec.require_paths.collect { |d| 
++      ret << File.join(spec.full_gem_path, d)
++    }
++    ret << File.join(spec.ext_dir, spec.require_paths.first) \
++      unless spec.extensions.empty? || (spec.ext_dir == spec.full_gem_path)
++    ret
+   end
+ 
+   def usage # :nodoc:
+-- 
+1.8.4.2
+
diff --git a/rubygems.spec b/rubygems.spec
index 2a83e15..a612010 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -25,7 +25,7 @@
 Summary:	The Ruby standard for packaging ruby libraries
 Name:		rubygems
 Version:	2.0.14
-Release:	112%{?dist}
+Release:	113%{?dist}
 Group:		Development/Libraries
 License:	Ruby or MIT
 
@@ -290,6 +290,9 @@ ruby -Ilib %{SOURCE11}
 
 
 %changelog
+* Wed Jan 15 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.0.14-113
+- Add extension directory also to WhichCommand::gem_paths (bug 1051169)
+
 * Thu Nov 14 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.0.14-112
 - Update to 2.0.14
 


More information about the scm-commits mailing list