Browse Source

ruby:
- change directory hierarchy
- use ruby abi version for load_path
- remove --with-ruby-version=''
- update operating_system.rb

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8695 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 9 years ago
parent
commit
5f2fccfd2d
1 changed files with 262 additions and 257 deletions
  1. 262 257
      r/ruby/ruby-vl.spec

+ 262 - 257
r/ruby/ruby-vl.spec

@@ -1,32 +1,30 @@
 %global major_version 2
 %global major_version 2
 %global minor_version 1
 %global minor_version 1
 %global teeny_version 2
 %global teeny_version 2
-#global patch_level 481
+#global patch_level 95
 
 
 %global major_minor_version %{major_version}.%{minor_version}
 %global major_minor_version %{major_version}.%{minor_version}
 
 
 %global ruby_version %{major_minor_version}.%{teeny_version}
 %global ruby_version %{major_minor_version}.%{teeny_version}
 %global ruby_version_patch_level %{major_minor_version}.%{teeny_version}
 %global ruby_version_patch_level %{major_minor_version}.%{teeny_version}
-%global ruby_release %{ruby_version}
+%global ruby_release %{major_minor_version}.0
 %global ruby_abi %{major_minor_version}.0
 %global ruby_abi %{major_minor_version}.0
 
 
 %global ruby_archive %{name}-%{ruby_version}
 %global ruby_archive %{name}-%{ruby_version}
 
 
-%global ruby_libdir %{_datadir}/%{name}/%{ruby_release}
-%global ruby_libarchdir %{_libdir}/%{name}/%{ruby_release}
-
-%global ruby_hdrdir %{_includedir}/%{name}-%{ruby_release}
+%global ruby_libdir %{_datadir}/%{name}
+%global ruby_libarchdir %{_libdir}/%{name}
 
 
 # This is the local lib/arch and should not be used for packaging.
 # This is the local lib/arch and should not be used for packaging.
 %global ruby_sitedir site_ruby
 %global ruby_sitedir site_ruby
-%global ruby_sitelibdir %{_prefix}/local/share/ruby/%{ruby_sitedir}/%{ruby_release}
-%global ruby_sitearchdir %{_prefix}/local/%{_lib}/ruby/%{ruby_sitedir}/%{ruby_release}
+%global ruby_sitelibdir %{_prefix}/local/share/ruby/%{ruby_sitedir}
+%global ruby_sitearchdir %{_prefix}/local/%{_lib}/ruby/%{ruby_sitedir}
 
 
 # This is the general location for libs/archs compatible with all
 # This is the general location for libs/archs compatible with all
 # or most of the Ruby versions
 # or most of the Ruby versions
 %global ruby_vendordir vendor_ruby
 %global ruby_vendordir vendor_ruby
-%global ruby_vendorlibdir %{_prefix}/share/ruby/%{ruby_vendordir}/%{ruby_release}
-%global ruby_vendorarchdir %{_libdir}/ruby/%{ruby_vendordir}/%{ruby_release}
+%global ruby_vendorlibdir %{_prefix}/share/ruby/%{ruby_vendordir}
+%global ruby_vendorarchdir %{_libdir}/ruby/%{ruby_vendordir}
 
 
 %global rubygems_version 2.2.2
 %global rubygems_version 2.2.2
 
 
@@ -56,7 +54,7 @@
 # we cannot reset the release number to 1 even when the main (ruby) version
 # we cannot reset the release number to 1 even when the main (ruby) version
 # is updated - because it may be that the versions of sub-components don't
 # is updated - because it may be that the versions of sub-components don't
 # change.
 # change.
-%global ruby_rel 5
+%global ruby_rel 6
 
 
 %bcond_without emacsen
 %bcond_without emacsen
 %define rbmode          ruby-mode
 %define rbmode          ruby-mode
@@ -455,9 +453,9 @@ autoconf
         --with-archdir='%{ruby_libarchdir}' \
         --with-archdir='%{ruby_libarchdir}' \
         --with-archlibdir='%{_libdir}' \
         --with-archlibdir='%{_libdir}' \
         --with-sitedir='%{ruby_sitelibdir}' \
         --with-sitedir='%{ruby_sitelibdir}' \
-        --with-sitearchdir='%{ruby_sitearchdir}' \
+        --with-sitearchdir='%{ruby_sitearchdir}/%{ruby_release}' \
         --with-vendordir='%{ruby_vendorlibdir}' \
         --with-vendordir='%{ruby_vendorlibdir}' \
-        --with-vendorarchdir='%{ruby_vendorarchdir}' \
+        --with-vendorarchdir='%{ruby_vendorarchdir}/%{ruby_release}' \
         --with-rubyhdrdir='%{_includedir}' \
         --with-rubyhdrdir='%{_includedir}' \
         --with-rubyarchhdrdir='%{_includedir}' \
         --with-rubyarchhdrdir='%{_includedir}' \
         --with-sitearchhdrdir='%{_includedir}/$(arch)' \
         --with-sitearchhdrdir='%{_includedir}/$(arch)' \
@@ -466,7 +464,6 @@ autoconf
         --with-ruby-pc='%{name}.pc' \
         --with-ruby-pc='%{name}.pc' \
         --disable-rpath \
         --disable-rpath \
         --enable-shared \
         --enable-shared \
-        --with-ruby-version='' \
         --enable-multiarch \
         --enable-multiarch \
         --with-prelude=./abrt_prelude.rb
         --with-prelude=./abrt_prelude.rb
 
 
@@ -498,32 +495,33 @@ cp misc/*.el %{SOURCE8} $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{rbmode}
 # Dump the macros into macro.ruby to use them to build other Ruby libraries.
 # Dump the macros into macro.ruby to use them to build other Ruby libraries.
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat >> %{buildroot}%{_sysconfdir}/rpm/macros.ruby << \EOF
 cat >> %{buildroot}%{_sysconfdir}/rpm/macros.ruby << \EOF
-%%ruby_libdir %%{_datadir}/%{name}/%{ruby_release}
-%%ruby_libarchdir %%{_libdir}/%{name}/%{ruby_release}
+%%ruby_libdir %%{_datadir}/%{name}
+%%ruby_libarchdir %%{_libdir}/%{name}
 
 
 # This is the local lib/arch and should not be used for packaging.
 # This is the local lib/arch and should not be used for packaging.
-%%ruby_sitedir site_ruby
-%%ruby_sitelibdir %%{_prefix}/local/share/%{name}/%%{ruby_sitedir}/%{ruby_release}
-%%ruby_sitearchdir %%{_prefix}/local/%%{_lib}/%{name}/%%{ruby_sitedir}/%{ruby_release}
+%%ruby_sitedir site_ruby/%{ruby_release}
+%%ruby_sitelibdir %%{_prefix}/local/share/%{name}/%%{ruby_sitedir}
+%%ruby_sitearchdir %%{_prefix}/local/%%{_lib}/%{name}/%%{ruby_sitedir}
 
 
 # This is the general location for libs/archs compatible with all
 # This is the general location for libs/archs compatible with all
 # or most of the Ruby versions
 # or most of the Ruby versions
-%%ruby_vendordir vendor_ruby
-%%ruby_vendorlibdir %%{_datadir}/%{name}/%%{ruby_vendordir}/%{ruby_release}
-%%ruby_vendorarchdir %%{_libdir}/%{name}/%%{ruby_vendordir}/%{ruby_release}
+%%ruby_vendordir vendor_ruby/%{ruby_release}
+%%ruby_vendorlibdir %%{_datadir}/%{name}/%%{ruby_vendordir}
+%%ruby_vendorarchdir %%{_libdir}/%{name}/%%{ruby_vendordir}
 EOF
 EOF
 
 
 cat >> %{buildroot}%{_sysconfdir}/rpm/macros.rubygems << \EOF
 cat >> %{buildroot}%{_sysconfdir}/rpm/macros.rubygems << \EOF
 # The RubyGems root folder.
 # The RubyGems root folder.
 %%gem_dir %{gem_dir}
 %%gem_dir %{gem_dir}
+%%gem_archdir %{_libdir}/gems
 
 
 # Common gem locations and files.
 # Common gem locations and files.
-%%gem_instdir %%{gem_dir}/gems/%%{gem_name}-%%{version}
-%%gem_extdir %%{_libdir}/gems/exts/%%{gem_name}-%%{version}
+%%gem_instdir %%{gem_dir}/%{ruby_release}/gems/%%{gem_name}-%%{version}
+%%gem_extdir %%{_libdir}/gems/%{ruby_release}/exts/%%{gem_name}-%%{version}
 %%gem_libdir %%{gem_instdir}/lib
 %%gem_libdir %%{gem_instdir}/lib
-%%gem_cache %%{gem_dir}/cache/%%{gem_name}-%%{version}.gem
-%%gem_spec %%{gem_dir}/specifications/%%{gem_name}-%%{version}.gemspec
-%%gem_docdir %%{gem_dir}/doc/%%{gem_name}-%%{version}
+%%gem_cache %%{gem_dir}/%{ruby_release}/cache/%%{gem_name}-%%{version}.gem
+%%gem_spec %%{gem_dir}/%{ruby_release}/specifications/%%{gem_name}-%%{version}.gemspec
+%%gem_docdir %%{gem_dir}/%{ruby_release}/doc/%%{gem_name}-%%{version}
 EOF
 EOF
 
 
 # Install custom operating_system.rb.
 # Install custom operating_system.rb.
@@ -540,85 +538,85 @@ mkdir -p %{buildroot}%{gem_extdirs}/exts
 # make symlinks for io-console and bigdecimal, 
 # make symlinks for io-console and bigdecimal, 
 # which are considered to be part of stdlib by other Gems
 # which are considered to be part of stdlib by other Gems
 ## rake
 ## rake
-mkdir -p %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/lib
-mv %{buildroot}%{ruby_libdir}/rake* %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/lib
-mv %{buildroot}%{gem_dir}/specifications/default/rake-%{rake_version}.gemspec %{buildroot}%{gem_dir}/specifications
+mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/rake-%{rake_version}/lib
+mv %{buildroot}%{ruby_libdir}/%{ruby_release}/rake* %{buildroot}%{gem_dir}/%{ruby_release}/gems/rake-%{rake_version}/lib
+mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/rake-%{rake_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
 
 
 ## rdoc
 ## rdoc
-mkdir -p %{buildroot}%{gem_dir}/gems/rdoc-%{rdoc_version}/lib
-mv %{buildroot}%{ruby_libdir}/rdoc* %{buildroot}%{gem_dir}/gems/rdoc-%{rdoc_version}/lib
-mv %{buildroot}%{gem_dir}/specifications/default/rdoc-%{rdoc_version}.gemspec %{buildroot}%{gem_dir}/specifications
+mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/rdoc-%{rdoc_version}/lib
+mv %{buildroot}%{ruby_libdir}/%{ruby_release}/rdoc* %{buildroot}%{gem_dir}/%{ruby_release}/gems/rdoc-%{rdoc_version}/lib
+mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/rdoc-%{rdoc_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
 
 
 ## bigdecimal
 ## bigdecimal
 # gem_dir
 # gem_dir
-mkdir -p %{buildroot}%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib
-mv %{buildroot}%{ruby_libdir}/bigdecimal %{buildroot}%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib
-ln -s %{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib/bigdecimal %{buildroot}%{ruby_libdir}/bigdecimal
+mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/bigdecimal-%{bigdecimal_version}/lib
+mv %{buildroot}%{ruby_libdir}/%{ruby_release}/bigdecimal %{buildroot}%{gem_dir}/%{ruby_release}/gems/bigdecimal-%{bigdecimal_version}/lib
+ln -s %{gem_dir}/%{ruby_release}/gems/bigdecimal-%{bigdecimal_version}/lib/bigdecimal %{buildroot}%{ruby_libdir}/%{ruby_release}/bigdecimal
 # gem_extdir
 # gem_extdir
-mkdir -p %{buildroot}%{gem_extdir}/exts/bigdecimal-%{bigdecimal_version}/lib
-mv %{buildroot}%{ruby_libarchdir}/bigdecimal.so %{buildroot}%{gem_extdir}/exts/bigdecimal-%{bigdecimal_version}/lib
-ln -s %{gem_extdir}/exts/bigdecimal-%{bigdecimal_version}/lib/bigdecimal.so %{buildroot}%{ruby_libarchdir}/bigdecimal.so
-mv %{buildroot}%{gem_dir}/specifications/default/bigdecimal-%{bigdecimal_version}.gemspec %{buildroot}%{gem_dir}/specifications
+mkdir -p %{buildroot}%{gem_extdir}/%{ruby_release}/exts/bigdecimal-%{bigdecimal_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/%{ruby_release}/bigdecimal.so %{buildroot}%{gem_extdir}/%{ruby_release}/exts/bigdecimal-%{bigdecimal_version}/lib
+ln -s %{gem_extdir}/%{ruby_release}/exts/bigdecimal-%{bigdecimal_version}/lib/bigdecimal.so %{buildroot}%{ruby_libarchdir}/%{ruby_release}/bigdecimal.so
+mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/bigdecimal-%{bigdecimal_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
 
 
 ## io_console
 ## io_console
 # gem_dir
 # gem_dir
-mkdir -p %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
-mv %{buildroot}%{ruby_libdir}/io %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
-ln -s %{gem_dir}/gems/io-console-%{io_console_version}/lib/io %{buildroot}%{ruby_libdir}/io
+mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/io-console-%{io_console_version}/lib
+mv %{buildroot}%{ruby_libdir}/%{ruby_release}/io %{buildroot}%{gem_dir}/%{ruby_release}/gems/io-console-%{io_console_version}/lib
+ln -s %{gem_dir}/%{ruby_release}/gems/io-console-%{io_console_version}/lib/io %{buildroot}%{ruby_libdir}/%{ruby_release}/io
 # gem_extdir
 # gem_extdir
-mkdir -p %{buildroot}%{gem_extdir}/exts/io-console-%{io_console_version}/lib/io
-mv %{buildroot}%{ruby_libarchdir}/io/console.so %{buildroot}%{gem_extdir}/exts/io-console-%{io_console_version}/lib/io
-ln -s %{gem_extdir}/exts/io-console-%{io_console_version}/lib/io/console.so %{buildroot}%{ruby_libarchdir}/io/console.so
-mv %{buildroot}%{gem_dir}/specifications/default/io-console-%{io_console_version}.gemspec %{buildroot}%{gem_dir}/specifications
+mkdir -p %{buildroot}%{gem_extdir}/%{ruby_release}/exts/io-console-%{io_console_version}/lib/io
+mv %{buildroot}%{ruby_libarchdir}/%{ruby_release}/io/console.so %{buildroot}%{gem_extdir}/%{ruby_release}/exts/io-console-%{io_console_version}/lib/io
+ln -s %{gem_extdir}/%{ruby_release}/exts/io-console-%{io_console_version}/lib/io/console.so %{buildroot}%{ruby_libarchdir}/%{ruby_release}/io/console.so
+mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/io-console-%{io_console_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
 
 
 ## json
 ## json
 # gem_dir
 # gem_dir
-mkdir -p %{buildroot}%{gem_dir}/gems/json-%{json_version}/lib
-mv %{buildroot}%{ruby_libdir}/json* %{buildroot}%{gem_dir}/gems/json-%{json_version}/lib
-ln -s %{gem_dir}/gems/json-%{json_version}/lib/json %{buildroot}%{ruby_libdir}/json
+mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/json-%{json_version}/lib
+mv %{buildroot}%{ruby_libdir}/%{ruby_release}/json* %{buildroot}%{gem_dir}/%{ruby_release}/gems/json-%{json_version}/lib
+ln -s %{gem_dir}/%{ruby_release}/gems/json-%{json_version}/lib/json %{buildroot}%{ruby_libdir}/%{ruby_release}/json
 # gem_extdir
 # gem_extdir
-mkdir -p %{buildroot}%{gem_extdir}/exts/json-%{json_version}/lib
-mv %{buildroot}%{ruby_libarchdir}/json/ %{buildroot}%{gem_extdir}/exts/json-%{json_version}/lib/
-ln -s %{gem_extdir}/exts/json-%{json_version}/lib/json.so %{buildroot}%{ruby_libarchdir}/json.so
-mv %{buildroot}%{gem_dir}/specifications/default/json-%{json_version}.gemspec %{buildroot}%{gem_dir}/specifications
+mkdir -p %{buildroot}%{gem_extdir}/%{ruby_release}/exts/json-%{json_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/%{ruby_release}/json/ %{buildroot}%{gem_extdir}/%{ruby_release}/exts/json-%{json_version}/lib/
+ln -s %{gem_extdir}/%{ruby_release}/exts/json-%{json_version}/lib/json.so %{buildroot}%{ruby_libarchdir}/%{ruby_release}/json.so
+mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/json-%{json_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
 
 
 ## minitest
 ## minitest
-mkdir -p %{buildroot}%{gem_dir}/gems/minitest-%{minitest_version}/lib
-mv %{buildroot}%{ruby_libdir}/minitest %{buildroot}%{gem_dir}/gems/minitest-%{minitest_version}/lib
-mv %{buildroot}%{gem_dir}/specifications/default/minitest-%{minitest_version}.gemspec %{buildroot}%{gem_dir}/specifications
-ln -s %{gem_dir}/gems/minitest-%{minitest_version}/lib/minitest %{buildroot}%{ruby_libdir}/minitest
+mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/minitest-%{minitest_version}/lib
+mv %{buildroot}%{ruby_libdir}/%{ruby_release}/minitest %{buildroot}%{gem_dir}/%{ruby_release}/gems/minitest-%{minitest_version}/lib
+mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/minitest-%{minitest_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
+ln -s %{gem_dir}/%{ruby_release}/gems/minitest-%{minitest_version}/lib/minitest %{buildroot}%{ruby_libdir}/%{ruby_release}/minitest
 
 
 ## psych
 ## psych
-mkdir -p %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib
-mkdir -p %{buildroot}%{gem_extdir}/exts/psych-%{psych_version}/lib
-mv %{buildroot}%{ruby_libdir}/psych* %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib
-mv %{buildroot}%{ruby_libarchdir}/psych.so %{buildroot}%{gem_extdir}/exts/psych-%{psych_version}/lib/
-mv %{buildroot}%{gem_dir}/specifications/default/psych-%{psych_version}.gemspec %{buildroot}%{gem_dir}/specifications
-ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir}/psych
-ln -s %{gem_extdir}/exts/psych-%{psych_version}/lib/psych.so %{buildroot}%{ruby_libarchdir}/psych.so
-ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb
+mkdir -p %{buildroot}%{gem_dir}/%{ruby_release}/gems/psych-%{psych_version}/lib
+mkdir -p %{buildroot}%{gem_extdir}/%{ruby_release}/exts/psych-%{psych_version}/lib
+mv %{buildroot}%{ruby_libdir}/%{ruby_release}/psych* %{buildroot}%{gem_dir}/%{ruby_release}/gems/psych-%{psych_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/%{ruby_release}/psych.so %{buildroot}%{gem_extdir}/%{ruby_release}/exts/psych-%{psych_version}/lib/
+mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/psych-%{psych_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
+ln -s %{gem_dir}/%{ruby_release}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir}/%{ruby_release}/psych
+ln -s %{gem_extdir}/%{ruby_release}/exts/psych-%{psych_version}/lib/psych.so %{buildroot}%{ruby_libarchdir}/%{ruby_release}/psych.so
+ln -s %{gem_dir}/%{ruby_release}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/%{ruby_release}/psych.rb
 
 
 # Adjust the gemspec files so that the gems will load properly
 # Adjust the gemspec files so that the gems will load properly
 sed -i '/^end$/ i\
 sed -i '/^end$/ i\
-  s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/rake-%{rake_version}.gemspec
+  s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/%{ruby_release}/specifications/rake-%{rake_version}.gemspec
 
 
 sed -i '/^end$/ i\
 sed -i '/^end$/ i\
-  s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
+  s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/%{ruby_release}/specifications/rdoc-%{rdoc_version}.gemspec
 
 
 sed -i '/^end$/ i\
 sed -i '/^end$/ i\
   s.require_paths = ["lib"]\
   s.require_paths = ["lib"]\
-  s.extensions = ["bigdecimal.so"]' %{buildroot}%{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
+  s.extensions = ["bigdecimal.so"]' %{buildroot}%{gem_dir}/%{ruby_release}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
 
 
 sed -i '/^end$/ i\
 sed -i '/^end$/ i\
   s.require_paths = ["lib"]\
   s.require_paths = ["lib"]\
-  s.extensions = ["io/console.so"]' %{buildroot}%{gem_dir}/specifications/io-console-%{io_console_version}.gemspec
+  s.extensions = ["io/console.so"]' %{buildroot}%{gem_dir}/%{ruby_release}/specifications/io-console-%{io_console_version}.gemspec
 
 
 sed -i '/^end$/ i\
 sed -i '/^end$/ i\
   s.require_paths = ["lib"]\
   s.require_paths = ["lib"]\
-  s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}%{gem_dir}/specifications/json-%{json_version}.gemspec
+  s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}%{gem_dir}/%{ruby_release}/specifications/json-%{json_version}.gemspec
 
 
 sed -i '/^end$/ i\
 sed -i '/^end$/ i\
-  s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
+  s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/%{ruby_release}/specifications/minitest-%{minitest_version}.gemspec
 
 
 %check
 %check
 DISABLE_TESTS=""
 DISABLE_TESTS=""
@@ -715,184 +713,186 @@ fi
 # List all these files explicitly to prevent surprises
 # List all these files explicitly to prevent surprises
 # Platform independent libraries.
 # Platform independent libraries.
 %dir %{ruby_libdir}
 %dir %{ruby_libdir}
-%{ruby_libdir}/*.rb
-%exclude %{ruby_libdir}/*-tk.rb
-%exclude %{ruby_libdir}/irb.rb
-%exclude %{ruby_libdir}/tcltk.rb
-%exclude %{ruby_libdir}/tk*.rb
-%{ruby_libdir}/cgi
-%{ruby_libdir}/date
-%{ruby_libdir}/digest
-%{ruby_libdir}/dl
-%{ruby_libdir}/drb
-%{ruby_libdir}/fiddle
-%exclude %{ruby_libdir}/irb
-%{ruby_libdir}/matrix
-%{ruby_libdir}/net
-%{ruby_libdir}/openssl
-%{ruby_libdir}/optparse
-%{ruby_libdir}/psych
-%{ruby_libdir}/racc
-%{ruby_libdir}/rbconfig
-%{ruby_libdir}/rexml
-%{ruby_libdir}/rinda
-%{ruby_libdir}/ripper
-%{ruby_libdir}/rss
-%{ruby_libdir}/shell
-%{ruby_libdir}/test
-%{ruby_libdir}/syslog
-%exclude %{ruby_libdir}/tk
-%exclude %{ruby_libdir}/tkextlib
-%{ruby_libdir}/uri
-%{ruby_libdir}/webrick
-%{ruby_libdir}/xmlrpc
-%{ruby_libdir}/yaml
+%dir %{ruby_libdir}/%{ruby_release}
+%{ruby_libdir}/%{ruby_release}/*.rb
+%exclude %{ruby_libdir}/%{ruby_release}/*-tk.rb
+%exclude %{ruby_libdir}/%{ruby_release}/irb.rb
+%exclude %{ruby_libdir}/%{ruby_release}/tcltk.rb
+%exclude %{ruby_libdir}/%{ruby_release}/tk*.rb
+%{ruby_libdir}/%{ruby_release}/cgi
+%{ruby_libdir}/%{ruby_release}/date
+%{ruby_libdir}/%{ruby_release}/digest
+%{ruby_libdir}/%{ruby_release}/dl
+%{ruby_libdir}/%{ruby_release}/drb
+%{ruby_libdir}/%{ruby_release}/fiddle
+%exclude %{ruby_libdir}/%{ruby_release}/irb
+%{ruby_libdir}/%{ruby_release}/matrix
+%{ruby_libdir}/%{ruby_release}/net
+%{ruby_libdir}/%{ruby_release}/openssl
+%{ruby_libdir}/%{ruby_release}/optparse
+%{ruby_libdir}/%{ruby_release}/psych
+%{ruby_libdir}/%{ruby_release}/racc
+%{ruby_libdir}/%{ruby_release}/rbconfig
+%{ruby_libdir}/%{ruby_release}/rexml
+%{ruby_libdir}/%{ruby_release}/rinda
+%{ruby_libdir}/%{ruby_release}/ripper
+%{ruby_libdir}/%{ruby_release}/rss
+%{ruby_libdir}/%{ruby_release}/shell
+%{ruby_libdir}/%{ruby_release}/test
+%{ruby_libdir}/%{ruby_release}/syslog
+%exclude %{ruby_libdir}/%{ruby_release}/tk
+%exclude %{ruby_libdir}/%{ruby_release}/tkextlib
+%{ruby_libdir}/%{ruby_release}/uri
+%{ruby_libdir}/%{ruby_release}/webrick
+%{ruby_libdir}/%{ruby_release}/xmlrpc
+%{ruby_libdir}/%{ruby_release}/yaml
 
 
 # Platform specific libraries.
 # Platform specific libraries.
 %{_libdir}/libruby.so.*
 %{_libdir}/libruby.so.*
 %dir %{ruby_libarchdir}
 %dir %{ruby_libarchdir}
-%{ruby_libarchdir}/continuation.so
-%{ruby_libarchdir}/coverage.so
-%{ruby_libarchdir}/date_core.so
-%{ruby_libarchdir}/dbm.so
-%dir %{ruby_libarchdir}/digest
-%{ruby_libarchdir}/digest.so
-%{ruby_libarchdir}/digest/bubblebabble.so
-%{ruby_libarchdir}/digest/md5.so
-%{ruby_libarchdir}/digest/rmd160.so
-%{ruby_libarchdir}/digest/sha1.so
-%{ruby_libarchdir}/digest/sha2.so
-%dir %{ruby_libarchdir}/dl
-%{ruby_libarchdir}/dl.so
-%{ruby_libarchdir}/dl/callback.so
-%dir %{ruby_libarchdir}/enc
-%{ruby_libarchdir}/enc/big5.so
-%{ruby_libarchdir}/enc/cp949.so
-%{ruby_libarchdir}/enc/emacs_mule.so
-%{ruby_libarchdir}/enc/encdb.so
-%{ruby_libarchdir}/enc/euc_jp.so
-%{ruby_libarchdir}/enc/euc_kr.so
-%{ruby_libarchdir}/enc/euc_tw.so
-%{ruby_libarchdir}/enc/gb18030.so
-%{ruby_libarchdir}/enc/gb2312.so
-%{ruby_libarchdir}/enc/gbk.so
-%{ruby_libarchdir}/enc/iso_8859_1.so
-%{ruby_libarchdir}/enc/iso_8859_10.so
-%{ruby_libarchdir}/enc/iso_8859_11.so
-%{ruby_libarchdir}/enc/iso_8859_13.so
-%{ruby_libarchdir}/enc/iso_8859_14.so
-%{ruby_libarchdir}/enc/iso_8859_15.so
-%{ruby_libarchdir}/enc/iso_8859_16.so
-%{ruby_libarchdir}/enc/iso_8859_2.so
-%{ruby_libarchdir}/enc/iso_8859_3.so
-%{ruby_libarchdir}/enc/iso_8859_4.so
-%{ruby_libarchdir}/enc/iso_8859_5.so
-%{ruby_libarchdir}/enc/iso_8859_6.so
-%{ruby_libarchdir}/enc/iso_8859_7.so
-%{ruby_libarchdir}/enc/iso_8859_8.so
-%{ruby_libarchdir}/enc/iso_8859_9.so
-%{ruby_libarchdir}/enc/koi8_r.so
-%{ruby_libarchdir}/enc/koi8_u.so
-%{ruby_libarchdir}/enc/shift_jis.so
-%dir %{ruby_libarchdir}/enc/trans
-%{ruby_libarchdir}/enc/trans/big5.so
-%{ruby_libarchdir}/enc/trans/chinese.so
-%{ruby_libarchdir}/enc/trans/emoji.so
-%{ruby_libarchdir}/enc/trans/emoji_iso2022_kddi.so
-%{ruby_libarchdir}/enc/trans/emoji_sjis_docomo.so
-%{ruby_libarchdir}/enc/trans/emoji_sjis_kddi.so
-%{ruby_libarchdir}/enc/trans/emoji_sjis_softbank.so
-%{ruby_libarchdir}/enc/trans/escape.so
-%{ruby_libarchdir}/enc/trans/gb18030.so
-%{ruby_libarchdir}/enc/trans/gbk.so
-%{ruby_libarchdir}/enc/trans/iso2022.so
-%{ruby_libarchdir}/enc/trans/japanese.so
-%{ruby_libarchdir}/enc/trans/japanese_euc.so
-%{ruby_libarchdir}/enc/trans/japanese_sjis.so
-%{ruby_libarchdir}/enc/trans/korean.so
-%{ruby_libarchdir}/enc/trans/single_byte.so
-%{ruby_libarchdir}/enc/trans/transdb.so
-%{ruby_libarchdir}/enc/trans/utf8_mac.so
-%{ruby_libarchdir}/enc/trans/utf_16_32.so
-%{ruby_libarchdir}/enc/utf_16be.so
-%{ruby_libarchdir}/enc/utf_16le.so
-%{ruby_libarchdir}/enc/utf_32be.so
-%{ruby_libarchdir}/enc/utf_32le.so
-%{ruby_libarchdir}/enc/windows_1251.so
-%{ruby_libarchdir}/enc/windows_31j.so
-%{ruby_libarchdir}/etc.so
-%{ruby_libarchdir}/fcntl.so
-%{ruby_libarchdir}/fiber.so
-%{ruby_libarchdir}/fiddle.so
-%{ruby_libarchdir}/gdbm.so
-%dir %{ruby_libarchdir}/io
-%{ruby_libarchdir}/io/nonblock.so
-%{ruby_libarchdir}/io/wait.so
-%dir %{ruby_libarchdir}/mathn
-%{ruby_libarchdir}/mathn/complex.so
-%{ruby_libarchdir}/mathn/rational.so
-%{ruby_libarchdir}/nkf.so
-%{ruby_libarchdir}/objspace.so
-%{ruby_libarchdir}/openssl.so
-%{ruby_libarchdir}/pathname.so
-%{ruby_libarchdir}/psych.so
-%{ruby_libarchdir}/pty.so
-%dir %{ruby_libarchdir}/racc
-%{ruby_libarchdir}/racc/cparse.so
-%{ruby_libarchdir}/rbconfig.rb
-%{ruby_libarchdir}/rbconfig/sizeof.so
-%{ruby_libarchdir}/readline.so
-%{ruby_libarchdir}/ripper.so
-%{ruby_libarchdir}/sdbm.so
-%{ruby_libarchdir}/socket.so
-%{ruby_libarchdir}/stringio.so
-%{ruby_libarchdir}/strscan.so
-%{ruby_libarchdir}/syslog.so
-%exclude %{ruby_libarchdir}/tcltklib.so
-%{ruby_libarchdir}/thread.so
-%exclude %{ruby_libarchdir}/tkutil.so
-%{ruby_libarchdir}/zlib.so
+%dir %{ruby_libarchdir}/%{ruby_release}
+%{ruby_libarchdir}/%{ruby_release}/continuation.so
+%{ruby_libarchdir}/%{ruby_release}/coverage.so
+%{ruby_libarchdir}/%{ruby_release}/date_core.so
+%{ruby_libarchdir}/%{ruby_release}/dbm.so
+%dir %{ruby_libarchdir}/%{ruby_release}/digest
+%{ruby_libarchdir}/%{ruby_release}/digest.so
+%{ruby_libarchdir}/%{ruby_release}/digest/bubblebabble.so
+%{ruby_libarchdir}/%{ruby_release}/digest/md5.so
+%{ruby_libarchdir}/%{ruby_release}/digest/rmd160.so
+%{ruby_libarchdir}/%{ruby_release}/digest/sha1.so
+%{ruby_libarchdir}/%{ruby_release}/digest/sha2.so
+%dir %{ruby_libarchdir}/%{ruby_release}/dl
+%{ruby_libarchdir}/%{ruby_release}/dl.so
+%{ruby_libarchdir}/%{ruby_release}/dl/callback.so
+%dir %{ruby_libarchdir}/%{ruby_release}/enc
+%{ruby_libarchdir}/%{ruby_release}/enc/big5.so
+%{ruby_libarchdir}/%{ruby_release}/enc/cp949.so
+%{ruby_libarchdir}/%{ruby_release}/enc/emacs_mule.so
+%{ruby_libarchdir}/%{ruby_release}/enc/encdb.so
+%{ruby_libarchdir}/%{ruby_release}/enc/euc_jp.so
+%{ruby_libarchdir}/%{ruby_release}/enc/euc_kr.so
+%{ruby_libarchdir}/%{ruby_release}/enc/euc_tw.so
+%{ruby_libarchdir}/%{ruby_release}/enc/gb18030.so
+%{ruby_libarchdir}/%{ruby_release}/enc/gb2312.so
+%{ruby_libarchdir}/%{ruby_release}/enc/gbk.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_1.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_10.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_11.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_13.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_14.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_15.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_16.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_2.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_3.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_4.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_5.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_6.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_7.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_8.so
+%{ruby_libarchdir}/%{ruby_release}/enc/iso_8859_9.so
+%{ruby_libarchdir}/%{ruby_release}/enc/koi8_r.so
+%{ruby_libarchdir}/%{ruby_release}/enc/koi8_u.so
+%{ruby_libarchdir}/%{ruby_release}/enc/shift_jis.so
+%dir %{ruby_libarchdir}/%{ruby_release}/enc/trans
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/big5.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/chinese.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/emoji.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/emoji_iso2022_kddi.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/emoji_sjis_docomo.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/emoji_sjis_kddi.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/emoji_sjis_softbank.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/escape.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/gb18030.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/gbk.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/iso2022.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/japanese.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/japanese_euc.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/japanese_sjis.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/korean.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/single_byte.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/transdb.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/utf8_mac.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/utf_16_32.so
+%{ruby_libarchdir}/%{ruby_release}/enc/utf_16be.so
+%{ruby_libarchdir}/%{ruby_release}/enc/utf_16le.so
+%{ruby_libarchdir}/%{ruby_release}/enc/utf_32be.so
+%{ruby_libarchdir}/%{ruby_release}/enc/utf_32le.so
+%{ruby_libarchdir}/%{ruby_release}/enc/windows_1251.so
+%{ruby_libarchdir}/%{ruby_release}/enc/windows_31j.so
+%{ruby_libarchdir}/%{ruby_release}/etc.so
+%{ruby_libarchdir}/%{ruby_release}/fcntl.so
+%{ruby_libarchdir}/%{ruby_release}/fiber.so
+%{ruby_libarchdir}/%{ruby_release}/fiddle.so
+%{ruby_libarchdir}/%{ruby_release}/gdbm.so
+%dir %{ruby_libarchdir}/%{ruby_release}/io
+%{ruby_libarchdir}/%{ruby_release}/io/nonblock.so
+%{ruby_libarchdir}/%{ruby_release}/io/wait.so
+%dir %{ruby_libarchdir}/%{ruby_release}/mathn
+%{ruby_libarchdir}/%{ruby_release}/mathn/complex.so
+%{ruby_libarchdir}/%{ruby_release}/mathn/rational.so
+%{ruby_libarchdir}/%{ruby_release}/nkf.so
+%{ruby_libarchdir}/%{ruby_release}/objspace.so
+%{ruby_libarchdir}/%{ruby_release}/openssl.so
+%{ruby_libarchdir}/%{ruby_release}/pathname.so
+%{ruby_libarchdir}/%{ruby_release}/psych.so
+%{ruby_libarchdir}/%{ruby_release}/pty.so
+%dir %{ruby_libarchdir}/%{ruby_release}/racc
+%{ruby_libarchdir}/%{ruby_release}/racc/cparse.so
+%{ruby_libarchdir}/%{ruby_release}/rbconfig.rb
+%{ruby_libarchdir}/%{ruby_release}/rbconfig/sizeof.so
+%{ruby_libarchdir}/%{ruby_release}/readline.so
+%{ruby_libarchdir}/%{ruby_release}/ripper.so
+%{ruby_libarchdir}/%{ruby_release}/sdbm.so
+%{ruby_libarchdir}/%{ruby_release}/socket.so
+%{ruby_libarchdir}/%{ruby_release}/stringio.so
+%{ruby_libarchdir}/%{ruby_release}/strscan.so
+%{ruby_libarchdir}/%{ruby_release}/syslog.so
+%exclude %{ruby_libarchdir}/%{ruby_release}/tcltklib.so
+%{ruby_libarchdir}/%{ruby_release}/thread.so
+%exclude %{ruby_libarchdir}/%{ruby_release}/tkutil.so
+%{ruby_libarchdir}/%{ruby_release}/zlib.so
 
 
 %files rubygems
 %files rubygems
 %{_bindir}/gem
 %{_bindir}/gem
 %{rubygems_dir}
 %{rubygems_dir}
 %{gem_dir}
 %{gem_dir}
-%exclude %{gem_dir}/gems/*
+%exclude %{gem_dir}/%{ruby_release}/gems/*
 %{_exec_prefix}/lib*/gems
 %{_exec_prefix}/lib*/gems
-%exclude %{_exec_prefix}/lib*/gems/exts/bigdecimal-%{bigdecimal_version}
-%exclude %{_exec_prefix}/lib*/gems/exts/io-console-%{io_console_version}
-%exclude %{_exec_prefix}/lib*/gems/exts/json-%{json_version}
-%exclude %{_exec_prefix}/lib*/gems/exts/psych-%{psych_version}
-%exclude %{gem_dir}/gems/rake-%{rake_version}
-%exclude %{gem_dir}/gems/rdoc-%{rdoc_version}
-%exclude %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
-%exclude %{gem_dir}/specifications/io-console-%{io_console_version}.gemspec
-%exclude %{gem_dir}/specifications/json-%{json_version}.gemspec
-%exclude %{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
-%exclude %{gem_dir}/specifications/rake-%{rake_version}.gemspec
-%exclude %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
-%exclude %{gem_dir}/specifications/psych-%{psych_version}.gemspec
+%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/bigdecimal-%{bigdecimal_version}
+%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/io-console-%{io_console_version}
+%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/json-%{json_version}
+%exclude %{_exec_prefix}/lib*/gems/%{ruby_release}/exts/psych-%{psych_version}
+%exclude %{gem_dir}/%{ruby_release}/gems/rake-%{rake_version}
+%exclude %{gem_dir}/%{ruby_release}/gems/rdoc-%{rdoc_version}
+%exclude %{gem_dir}/%{ruby_release}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
+%exclude %{gem_dir}/%{ruby_release}/specifications/io-console-%{io_console_version}.gemspec
+%exclude %{gem_dir}/%{ruby_release}/specifications/json-%{json_version}.gemspec
+%exclude %{gem_dir}/%{ruby_release}/specifications/minitest-%{minitest_version}.gemspec
+%exclude %{gem_dir}/%{ruby_release}/specifications/rake-%{rake_version}.gemspec
+%exclude %{gem_dir}/%{ruby_release}/specifications/rdoc-%{rdoc_version}.gemspec
+%exclude %{gem_dir}/%{ruby_release}/specifications/psych-%{psych_version}.gemspec
 
 
 %files rubygems-devel
 %files rubygems-devel
 %config(noreplace) %{_sysconfdir}/rpm/macros.rubygems
 %config(noreplace) %{_sysconfdir}/rpm/macros.rubygems
 
 
 %files -n rubygem-rake
 %files -n rubygem-rake
 %{_bindir}/rake
 %{_bindir}/rake
-%{gem_dir}/gems/rake-%{rake_version}
-%{gem_dir}/specifications/rake-%{rake_version}.gemspec
+%{gem_dir}/%{ruby_release}/gems/rake-%{rake_version}
+%{gem_dir}/%{ruby_release}/specifications/rake-%{rake_version}.gemspec
 %{_mandir}/man1/rake.1*
 %{_mandir}/man1/rake.1*
 
 
 %files irb
 %files irb
 %{_bindir}/irb
 %{_bindir}/irb
-%{ruby_libdir}/irb.rb
-%{ruby_libdir}/irb
+%{ruby_libdir}/%{ruby_release}/irb.rb
+%{ruby_libdir}/%{ruby_release}/irb
 %{_mandir}/man1/irb.1*
 %{_mandir}/man1/irb.1*
 
 
 %files -n rubygem-rdoc
 %files -n rubygem-rdoc
 %{_bindir}/rdoc
 %{_bindir}/rdoc
 %{_bindir}/ri
 %{_bindir}/ri
-%{gem_dir}/gems/rdoc-%{rdoc_version}
-%{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
+%{gem_dir}/%{ruby_release}/gems/rdoc-%{rdoc_version}
+%{gem_dir}/%{ruby_release}/specifications/rdoc-%{rdoc_version}.gemspec
 %{_mandir}/man1/ri*
 %{_mandir}/man1/ri*
 
 
 %files doc
 %files doc
@@ -904,47 +904,47 @@ fi
 %{_docdir}/ruby
 %{_docdir}/ruby
 
 
 %files -n rubygem-bigdecimal
 %files -n rubygem-bigdecimal
-%{ruby_libdir}/bigdecimal
-%{ruby_libarchdir}/bigdecimal.so
-%{gem_extdir}/exts/bigdecimal-%{bigdecimal_version}
-%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}
-%{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
+%{ruby_libdir}/%{ruby_release}/bigdecimal
+%{ruby_libarchdir}/%{ruby_release}/bigdecimal.so
+%{gem_extdir}/%{ruby_release}/exts/bigdecimal-%{bigdecimal_version}
+%{gem_dir}/%{ruby_release}/gems/bigdecimal-%{bigdecimal_version}
+%{gem_dir}/%{ruby_release}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
 
 
 %files -n rubygem-io-console
 %files -n rubygem-io-console
-%{ruby_libdir}/io
-%{ruby_libarchdir}/io/console.so
-%{gem_extdir}/exts/io-console-%{io_console_version}
-%{gem_dir}/gems/io-console-%{io_console_version}
-%{gem_dir}/specifications/io-console-%{io_console_version}.gemspec
+%{ruby_libdir}/%{ruby_release}/io
+%{ruby_libarchdir}/%{ruby_release}/io/console.so
+%{gem_extdir}/%{ruby_release}/exts/io-console-%{io_console_version}
+%{gem_dir}/%{ruby_release}/gems/io-console-%{io_console_version}
+%{gem_dir}/%{ruby_release}/specifications/io-console-%{io_console_version}.gemspec
 
 
 %files -n rubygem-json
 %files -n rubygem-json
-%{ruby_libdir}/json
-%{ruby_libarchdir}/json.so
-%{gem_extdir}/exts/json-%{json_version}
-%{gem_dir}/gems/json-%{json_version}
-%{gem_dir}/specifications/json-%{json_version}.gemspec
+%{ruby_libdir}/%{ruby_release}/json
+%{ruby_libarchdir}/%{ruby_release}/json.so
+%{gem_extdir}/%{ruby_release}/exts/json-%{json_version}
+%{gem_dir}/%{ruby_release}/gems/json-%{json_version}
+%{gem_dir}/%{ruby_release}/specifications/json-%{json_version}.gemspec
 
 
 %files -n rubygem-minitest
 %files -n rubygem-minitest
-%{ruby_libdir}/minitest
-%{gem_dir}/gems/minitest-%{minitest_version}
-%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
+%{ruby_libdir}/%{ruby_release}/minitest
+%{gem_dir}/%{ruby_release}/gems/minitest-%{minitest_version}
+%{gem_dir}/%{ruby_release}/specifications/minitest-%{minitest_version}.gemspec
 
 
 %files -n rubygem-psych
 %files -n rubygem-psych
-%{ruby_libdir}/psych
-%{ruby_libdir}/psych.rb
-%{ruby_libarchdir}/psych.so
-%{gem_extdir}/exts/psych-%{psych_version}
-%{gem_dir}/gems/psych-%{psych_version}
-%{gem_dir}/specifications/psych-%{psych_version}.gemspec
+%{ruby_libdir}/%{ruby_release}/psych
+%{ruby_libdir}/%{ruby_release}/psych.rb
+%{ruby_libarchdir}/%{ruby_release}/psych.so
+%{gem_extdir}/%{ruby_release}/exts/psych-%{psych_version}
+%{gem_dir}/%{ruby_release}/gems/psych-%{psych_version}
+%{gem_dir}/%{ruby_release}/specifications/psych-%{psych_version}.gemspec
 
 
 %files tcltk
 %files tcltk
-%{ruby_libdir}/*-tk.rb
-%{ruby_libdir}/tcltk.rb
-%{ruby_libdir}/tk*.rb
-%{ruby_libarchdir}/tcltklib.so
-%{ruby_libarchdir}/tkutil.so
-%{ruby_libdir}/tk
-%{ruby_libdir}/tkextlib
+%{ruby_libdir}/%{ruby_release}/*-tk.rb
+%{ruby_libdir}/%{ruby_release}/tcltk.rb
+%{ruby_libdir}/%{ruby_release}/tk*.rb
+%{ruby_libarchdir}/%{ruby_release}/tcltklib.so
+%{ruby_libarchdir}/%{ruby_release}/tkutil.so
+%{ruby_libdir}/%{ruby_release}/tk
+%{ruby_libdir}/%{ruby_release}/tkextlib
 
 
 %if %{with emacsen}
 %if %{with emacsen}
 %files mode
 %files mode
@@ -956,7 +956,12 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
-* Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.1.2-1
+* Fri Jun 27 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.1.2-6
+- use ruby abi version for load_path
+  - remove --with-ruby-version=''
+  - update operating_system.rb
+
+* Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.1.2-5
 - update to 2.1.2
 - update to 2.1.2
 
 
 * Wed May 21 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.0.481-4
 * Wed May 21 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.0.481-4