[rubygems/f17] 1.8.22

[Mamoru Tasaka]

commit 68a16a477b1f7205b2837b276f76df4d919da8ae
Author: Mamoru TASAKA <mtasaka at localhost.localdomain>
Date:   Wed Apr 18 14:53:38 2012 +0900

    1.8.22

 .gitignore    |    1 +
 rubygems.spec |   22 ++++++++++++++++------
 sources       |    3 +--
 3 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e5f8e6..ad69a24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ rubygems-1.3.7.tgz
 /rubygems-1.8.10.tgz
 /rubygems-1.8.11.tgz
 /rubygems-1.8.15.tgz
+/rubygems-1.8.22.tgz
diff --git a/rubygems.spec b/rubygems.spec
index 6b600f9..f661fe7 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -17,8 +17,8 @@
 
 Summary:	The Ruby standard for packaging ruby libraries
 Name:		rubygems
-Version:	1.8.15
-Release:	2%{?dist}.1
+Version:	1.8.22
+Release:	1%{?dist}
 Group:		Development/Libraries
 License:	Ruby or MIT
 
@@ -41,7 +41,8 @@ Patch1:		rubygems-1.8.6-show-extension-build-process-in-sync.patch
 Patch3:		rubygems-1.8.5-show-rdoc-process-verbosely.patch
 # Fix Gem.all_load_paths (although it is deprecated and will be removed
 # on 2011-10-01)
-Patch6:		rubygems-1.8.5-all-load-paths.patch
+# Fixed in 1.8.22
+#Patch6:		rubygems-1.8.5-all-load-paths.patch
 
 # Patches from the works by Vít Ondruch <vondruch at redhat.com>
 # Fix the uninstaller, so that it doesn't say that gem doesn't exist
@@ -88,7 +89,7 @@ Macros and development tools for packagin RubyGems.
 %if 1
 %patch1 -p1 -b .insync
 %patch3 -p1 -b .rdoc_v
-%patch6 -p1 -b .load_path
+#%%patch6 -p1 -b .load_path
 %endif
 %patch105 -p1 -b .uninst
 %patch109 -p1 -b .bindir
@@ -147,8 +148,14 @@ mkdir -p lib/rubygems/defaults
 touch lib/rubygems/defaults/operating_system.rb
 
 # It is necessary to specify the paths using RUBYOPT to let the test suite pass."
-GEM_PATH=%{gem_dir} RUBYOPT="-Itest -I%{_libdir}/gems/exts/io-console-0.3/lib/ -I./lib/" \
-	testrb test
+export GEM_PATH=%{gem_dir}
+RUBYOPT="-Itest -Ilib" 
+RUBYOPT="$RUBYOPT -I%{_libdir}/gems/exts/io-console-0.3/lib/"
+# In case that rubygem-json is installed
+RUBYOPT="$RUBYOPT -I%{gem_dir}/gems/json-1.6.5/lib -I%{_libdir}/gems/exts/json-1.6.5/ext/json/ext"
+export RUBYOPT
+
+testrb test
 %endif
 
 %files
@@ -178,6 +185,9 @@ GEM_PATH=%{gem_dir} RUBYOPT="-Itest -I%{_libdir}/gems/exts/io-console-0.3/lib/ -
 %config(noreplace)  %{_sysconfdir}/rpm/macros.rubygems
 
 %changelog
+* Thu Apr 18 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.8.22-1
+- 1.8.22
+
 * Thu Jan 26 2012 Vít Ondruch <vondruch at redhat.com> - 1.8.15-2
 - Make test suite green.
 
diff --git a/sources b/sources
index 22ad7da..8e13f48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4e9fc1aa1be60439adf4132250424679  rubygems-1.8.15.tgz
-5c796d4423e5186c61e844b9beb6efec  rubygems-1.8.11.tgz
+fd06f165d08f99918de5095be2a9435c  rubygems-1.8.22.tgz