[rubygems/f18] Detect json / io-console directory at %check

[Mamoru Tasaka]

commit e491102863bdff64dbb56520304dc9d386b9540e
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Fri Mar 8 21:22:38 2013 +0900

    Detect json / io-console directory at %check
    
    - Prevent squash of %gem_install with following line
      (Vít Ondruch <vondruch at redhat.com>)

 rubygems.spec |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/rubygems.spec b/rubygems.spec
index e4e5bb6..61e819f 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -26,7 +26,7 @@
 Summary:	The Ruby standard for packaging ruby libraries
 Name:		rubygems
 Version:	1.8.25
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Development/Libraries
 License:	Ruby or MIT
 
@@ -170,7 +170,8 @@ gem install \\\
         --bindir .%%{_bindir} \\\
         --force \\\
         --rdoc \\\
-        %%{-n*}%%{!?-n:%%{gem_name}-%%{version}.gem}
+        %%{-n*}%%{!?-n:%%{gem_name}-%%{version}.gem} \
+%%{nil}
 EOF
 
 %if %{enable_check}
@@ -183,9 +184,17 @@ touch lib/rubygems/defaults/operating_system.rb
 # It is necessary to specify the paths using RUBYOPT to let the test suite pass."
 export GEM_PATH=%{gem_dir}
 RUBYOPT="-Itest -Ilib" 
-RUBYOPT="$RUBYOPT -I%{buildtime_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%{buildtime_libdir}/gems/exts/json-1.6.5/ext/json/ext"
+for dir in \
+	%{buildtime_libdir}/gems/exts/io-console-*/lib/ \
+	%{gem_dir}/gems/json-*/lib \
+%if 0%{?fedora} < 19
+	%{buildtime_libdir}/gems/exts/json-*/ext/json/ext
+%else
+	%{buildtime_libdir}/gems/exts/json-*/lib
+%endif
+do
+	RUBYOPT="$RUBYOPT -I$dir"
+done
 export RUBYOPT
 
 testrb test
@@ -218,6 +227,11 @@ testrb test
 %config(noreplace)  %{_sysconfdir}/rpm/macros.rubygems
 
 %changelog
+* Fri Mar  8 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.8.25-5
+- Detect json / io-console directory at %%check
+- Prevent squash of %%gem_install with following line
+  (Vít Ondruch <vondruch at redhat.com>)
+
 * Mon Feb 25 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.8.25-4
 - Backport %%gem_extdir_mri also