diff --git a/ruby.spec b/ruby.spec
index 12b8615..94d6153 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1368,15 +1368,15 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %files -n rubygem-irb
 %{_bindir}/irb
 %{ruby_libdir}/irb*
-%{gem_dir}/gems/irb-%{irb_version}
-%{gem_dir}/specifications/irb-%{irb_version}.gemspec
+%{gem_instdir irb}
+%{gem_spec irb}
 %{_mandir}/man1/irb.1*
 
 %files -n rubygem-rdoc
 %{_bindir}/rdoc
 %{_bindir}/ri
-%{gem_dir}/gems/rdoc-%{rdoc_version}
-%{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
+%{gem_instdir rdoc}
+%{gem_spec rdoc}
 %{_mandir}/man1/ri*
 
 %files doc -f .ruby-doc.en -f .ruby-doc.ja
@@ -1388,155 +1388,155 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %files -n rubygem-bigdecimal
 %{ruby_libdir}/bigdecimal*
 %{ruby_libarchdir}/bigdecimal*
-%{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}
-%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}
-%{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
+%{gem_extdir_mri bigdecimal}
+%{gem_instdir bigdecimal}
+%{gem_spec bigdecimal}
 
 %files -n rubygem-io-console
 %{ruby_libdir}/io
 %{ruby_libarchdir}/io/console.so
-%{_libdir}/gems/%{name}/io-console-%{io_console_version}
-%{gem_dir}/gems/io-console-%{io_console_version}
-%{gem_dir}/specifications/io-console-%{io_console_version}.gemspec
+%{gem_extdir_mri io-console}
+%{gem_instdir io-console}
+%{gem_spec io-console}
 
 %files -n rubygem-json
 %{ruby_libdir}/json*
 %{ruby_libarchdir}/json*
-%{_libdir}/gems/%{name}/json-%{json_version}
-%{gem_dir}/gems/json-%{json_version}
-%{gem_dir}/specifications/json-%{json_version}.gemspec
+%{gem_extdir_mri json}
+%{gem_instdir json}
+%{gem_spec json}
 
 %files -n rubygem-psych
 %{ruby_libdir}/psych
 %{ruby_libdir}/psych.rb
 %{ruby_libarchdir}/psych.so
-%{_libdir}/gems/%{name}/psych-%{psych_version}
-%dir %{gem_dir}/gems/psych-%{psych_version}
-%{gem_dir}/gems/psych-%{psych_version}/lib
-%{gem_dir}/specifications/psych-%{psych_version}.gemspec
+%{gem_extdir_mri psych}
+%dir %{gem_instdir psych}
+%{gem_libdir psych}
+%{gem_spec psych}
 
 %files -n rubygem-bundler
 %{_bindir}/bundle
 %{_bindir}/bundler
-%{gem_dir}/gems/bundler-%{bundler_version}
-%{gem_dir}/specifications/bundler-%{bundler_version}.gemspec
+%{gem_instdir bundler}
+%{gem_spec bundler}
 %{_mandir}/man1/bundle*.1*
 %{_mandir}/man5/gemfile.5*
 
 %files bundled-gems
 # rdbg
 %{_bindir}/rdbg
-%dir %{_libdir}/gems/%{name}/debug-%{debug_version}
-%{_libdir}/gems/%{name}/debug-%{debug_version}/gem.build_complete
-%dir %{_libdir}/gems/%{name}/debug-%{debug_version}/debug
-%{_libdir}/gems/%{name}/debug-%{debug_version}/debug/debug.so
-%dir %{gem_dir}/gems/debug-%{debug_version}
-%exclude %{gem_dir}/gems/debug-%{debug_version}/.*
-%doc %{gem_dir}/gems/debug-%{debug_version}/CONTRIBUTING.md
-%{gem_dir}/gems/debug-%{debug_version}/Gemfile
-%license %{gem_dir}/gems/debug-%{debug_version}/LICENSE.txt
-%doc %{gem_dir}/gems/debug-%{debug_version}/README.md
-%{gem_dir}/gems/debug-%{debug_version}/Rakefile
-%doc %{gem_dir}/gems/debug-%{debug_version}/TODO.md
-%{gem_dir}/gems/debug-%{debug_version}/exe
-%{gem_dir}/gems/debug-%{debug_version}/lib
-%{gem_dir}/gems/debug-%{debug_version}/misc
-%{gem_dir}/specifications/debug-%{debug_version}.gemspec
+%dir %{gem_extdir_mri debug}
+%{gem_extdir_mri debug}/gem.build_complete
+%dir %{gem_extdir_mri debug}/debug
+%{gem_extdir_mri debug}/debug/debug.so
+%dir %{gem_instdir debug}
+%exclude %{gem_instdir debug}/.*
+%doc %{gem_instdir debug}/CONTRIBUTING.md
+%{gem_instdir debug}/Gemfile
+%license %{gem_instdir debug}/LICENSE.txt
+%doc %{gem_instdir debug}/README.md
+%{gem_instdir debug}/Rakefile
+%doc %{gem_instdir debug}/TODO.md
+%{gem_instdir debug}/exe
+%{gem_libdir debug}
+%{gem_instdir debug}/misc
+%{gem_spec debug}
 
 # net-ftp
-%dir %{gem_dir}/gems/net-ftp-%{net_ftp_version}
-%{gem_dir}/gems/net-ftp-%{net_ftp_version}/Gemfile
-%license %{gem_dir}/gems/net-ftp-%{net_ftp_version}/LICENSE.txt
-%doc %{gem_dir}/gems/net-ftp-%{net_ftp_version}/README.md
-%{gem_dir}/gems/net-ftp-%{net_ftp_version}/Rakefile
-%{gem_dir}/gems/net-ftp-%{net_ftp_version}/lib
-%{gem_dir}/specifications/net-ftp-%{net_ftp_version}.gemspec
+%dir %{gem_instdir net-ftp}
+%{gem_instdir net-ftp}/Gemfile
+%license %{gem_instdir net-ftp}/LICENSE.txt
+%doc %{gem_instdir net-ftp}/README.md
+%{gem_instdir net-ftp}/Rakefile
+%{gem_libdir net-ftp}
+%{gem_spec net-ftp}
 
 # net-imap
-%dir %{gem_dir}/gems/net-imap-%{net_imap_version}
-%{gem_dir}/gems/net-imap-%{net_imap_version}/Gemfile
-%license %{gem_dir}/gems/net-imap-%{net_imap_version}/LICENSE.txt
-%doc %{gem_dir}/gems/net-imap-%{net_imap_version}/README.md
-%{gem_dir}/gems/net-imap-%{net_imap_version}/Rakefile
-%{gem_dir}/gems/net-imap-%{net_imap_version}/benchmarks
-%{gem_dir}/gems/net-imap-%{net_imap_version}/docs
-%{gem_dir}/gems/net-imap-%{net_imap_version}/lib
-%{gem_dir}/gems/net-imap-%{net_imap_version}/rakelib
-%{gem_dir}/specifications/net-imap-%{net_imap_version}.gemspec
+%dir %{gem_instdir net-imap}
+%{gem_instdir net-imap}/Gemfile
+%license %{gem_instdir net-imap}/LICENSE.txt
+%doc %{gem_instdir net-imap}/README.md
+%{gem_instdir net-imap}/Rakefile
+%{gem_instdir net-imap}/benchmarks
+%{gem_instdir net-imap}/docs
+%{gem_libdir net-imap}
+%{gem_instdir net-imap}/rakelib
+%{gem_spec net-imap}
 
 # net-pop
-%dir %{gem_dir}/gems/net-pop-%{net_pop_version}
-%{gem_dir}/gems/net-pop-%{net_pop_version}/Gemfile
-%license %{gem_dir}/gems/net-pop-%{net_pop_version}/LICENSE.txt
-%doc %{gem_dir}/gems/net-pop-%{net_pop_version}/README.md
-%{gem_dir}/gems/net-pop-%{net_pop_version}/Rakefile
-%{gem_dir}/gems/net-pop-%{net_pop_version}/lib
-%{gem_dir}/specifications/net-pop-%{net_pop_version}.gemspec
+%dir %{gem_instdir net-pop}
+%{gem_instdir net-pop}/Gemfile
+%license %{gem_instdir net-pop}/LICENSE.txt
+%doc %{gem_instdir net-pop}/README.md
+%{gem_instdir net-pop}/Rakefile
+%{gem_libdir net-pop}
+%{gem_spec net-pop}
 
-# net-smpt
-%dir %{gem_dir}/gems/net-smtp-%{net_smtp_version}
-%license %{gem_dir}/gems/net-smtp-%{net_smtp_version}/LICENSE.txt
-%{gem_dir}/gems/net-smtp-%{net_smtp_version}/lib
-%{gem_dir}/specifications/net-smtp-%{net_smtp_version}.gemspec
+# net-smtp
+%dir %{gem_instdir net-smtp}
+%license %{gem_instdir net-smtp}/LICENSE.txt
+%{gem_libdir net-smtp}
+%{gem_spec net-smtp}
 
 # matrix
-%dir %{gem_dir}/gems/matrix-%{matrix_version}
-%license %{gem_dir}/gems/matrix-%{matrix_version}/LICENSE.txt
-%{gem_dir}/gems/matrix-%{matrix_version}/lib
-%{gem_dir}/specifications/matrix-%{matrix_version}.gemspec
+%dir %{gem_instdir matrix}
+%license %{gem_instdir matrix}/LICENSE.txt
+%{gem_libdir matrix}
+%{gem_spec matrix}
 
 # prime
-%dir %{gem_dir}/gems/prime-%{prime_version}
-%{gem_dir}/gems/prime-%{prime_version}/Gemfile
-%license %{gem_dir}/gems/prime-%{prime_version}/LICENSE.txt
-%doc %{gem_dir}/gems/prime-%{prime_version}/README.md
-%{gem_dir}/gems/prime-%{prime_version}/Rakefile
-%{gem_dir}/gems/prime-%{prime_version}/bin
-%{gem_dir}/gems/prime-%{prime_version}/lib
-%{gem_dir}/specifications/prime-%{prime_version}.gemspec
+%dir %{gem_instdir prime}
+%{gem_instdir prime}/Gemfile
+%license %{gem_instdir prime}/LICENSE.txt
+%doc %{gem_instdir prime}/README.md
+%{gem_instdir prime}/Rakefile
+%{gem_instdir prime}/bin
+%{gem_libdir prime}
+%{gem_spec prime}
 
 # racc
-%dir %{gem_dir}/gems/racc-%{racc_version}
+%dir %{gem_instdir racc}
 %{_bindir}/racc
-%{gem_archdir}/%{name}/racc-%{racc_version}
-%license %{gem_dir}/gems/racc-%{racc_version}/COPYING
-%doc %{gem_dir}/gems/racc-%{racc_version}/ChangeLog
-%lang(ja) %doc %{gem_dir}/gems/racc-%{racc_version}/README.ja.rdoc
-%doc %{gem_dir}/gems/racc-%{racc_version}/README.rdoc
-%doc %{gem_dir}/gems/racc-%{racc_version}/TODO
-%{gem_dir}/gems/racc-%{racc_version}/bin
-%doc %{gem_dir}/gems/racc-%{racc_version}/doc
-%{gem_dir}/gems/racc-%{racc_version}/lib
-%{gem_dir}/specifications/racc-%{racc_version}.gemspec
+%{gem_extdir_mri racc}
+%license %{gem_instdir racc}/COPYING
+%doc %{gem_instdir racc}/ChangeLog
+%lang(ja) %doc %{gem_instdir racc}/README.ja.rdoc
+%doc %{gem_instdir racc}/README.rdoc
+%doc %{gem_instdir racc}/TODO
+%{gem_instdir racc}/bin
+%doc %{gem_instdir racc}/doc
+%{gem_libdir racc}
+%{gem_spec racc}
 
 %files -n rubygem-minitest
-%dir %{gem_dir}/gems/minitest-%{minitest_version}
-%exclude %{gem_dir}/gems/minitest-%{minitest_version}/.*
-%{gem_dir}/gems/minitest-%{minitest_version}/Manifest.txt
-%{gem_dir}/gems/minitest-%{minitest_version}/design_rationale.rb
-%{gem_dir}/gems/minitest-%{minitest_version}/lib
-%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
-%doc %{gem_dir}/gems/minitest-%{minitest_version}/History.rdoc
-%doc %{gem_dir}/gems/minitest-%{minitest_version}/README.rdoc
-%{gem_dir}/gems/minitest-%{minitest_version}/Rakefile
-%{gem_dir}/gems/minitest-%{minitest_version}/test
+%dir %{gem_instdir minitest}
+%exclude %{gem_instdir minitest}/.*
+%{gem_instdir minitest}/Manifest.txt
+%{gem_instdir minitest}/design_rationale.rb
+%{gem_libdir minitest}
+%{gem_spec minitest}
+%doc %{gem_instdir minitest}/History.rdoc
+%doc %{gem_instdir minitest}/README.rdoc
+%{gem_instdir minitest}/Rakefile
+%{gem_instdir minitest}/test
 
 %files -n rubygem-power_assert
-%dir %{gem_dir}/gems/power_assert-%{power_assert_version}
-%exclude %{gem_dir}/gems/power_assert-%{power_assert_version}/.*
-%license %{gem_dir}/gems/power_assert-%{power_assert_version}/BSDL
-%license %{gem_dir}/gems/power_assert-%{power_assert_version}/COPYING
-%license %{gem_dir}/gems/power_assert-%{power_assert_version}/LEGAL
-%{gem_dir}/gems/power_assert-%{power_assert_version}/lib
-%{gem_dir}/specifications/power_assert-%{power_assert_version}.gemspec
-%{gem_dir}/gems/power_assert-%{power_assert_version}/Gemfile
-%doc %{gem_dir}/gems/power_assert-%{power_assert_version}/README.md
-%{gem_dir}/gems/power_assert-%{power_assert_version}/Rakefile
+%dir %{gem_instdir power_assert}
+%exclude %{gem_instdir power_assert}/.*
+%license %{gem_instdir power_assert}/BSDL
+%license %{gem_instdir power_assert}/COPYING
+%license %{gem_instdir power_assert}/LEGAL
+%{gem_libdir power_assert}
+%{gem_spec power_assert}
+%{gem_instdir power_assert}/Gemfile
+%doc %{gem_instdir power_assert}/README.md
+%{gem_instdir power_assert}/Rakefile
 
 %files -n rubygem-rake
 %{_bindir}/rake
-%{gem_dir}/gems/rake-%{rake_version}
-%{gem_dir}/specifications/rake-%{rake_version}.gemspec
+%{gem_instdir rake}
+%{gem_spec rake}
 %{_mandir}/man1/rake.1*
 
 %files -n rubygem-rbs
@@ -1544,68 +1544,68 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %dir %{_libdir}/gems/%{name}/rbs-%{rbs_version}
 %{_libdir}/gems/%{name}/rbs-%{rbs_version}/gem.build_complete
 %{_libdir}/gems/%{name}/rbs-%{rbs_version}/rbs_extension.so
-%dir %{gem_dir}/gems/rbs-%{rbs_version}
-%exclude %{gem_dir}/gems/rbs-%{rbs_version}/.*
-%license %{gem_dir}/gems/rbs-%{rbs_version}/BSDL
-%doc %{gem_dir}/gems/rbs-%{rbs_version}/CHANGELOG.md
-%license %{gem_dir}/gems/rbs-%{rbs_version}/COPYING
-%{gem_dir}/gems/rbs-%{rbs_version}/Gemfile*
-%doc %{gem_dir}/gems/rbs-%{rbs_version}/README.md
-%{gem_dir}/gems/rbs-%{rbs_version}/Rakefile
-%{gem_dir}/gems/rbs-%{rbs_version}/Steepfile
-%{gem_dir}/gems/rbs-%{rbs_version}/core
-%doc %{gem_dir}/gems/rbs-%{rbs_version}/docs
-%{gem_dir}/gems/rbs-%{rbs_version}/exe
-%{gem_dir}/gems/rbs-%{rbs_version}/goodcheck.yml
-%{gem_dir}/gems/rbs-%{rbs_version}/lib
-%{gem_dir}/gems/rbs-%{rbs_version}/schema
-%{gem_dir}/gems/rbs-%{rbs_version}/sig
-%{gem_dir}/gems/rbs-%{rbs_version}/stdlib
-%{gem_dir}/specifications/rbs-%{rbs_version}.gemspec
+%dir %{gem_instdir rbs}
+%exclude %{gem_instdir rbs}/.*
+%license %{gem_instdir rbs}/BSDL
+%doc %{gem_instdir rbs}/CHANGELOG.md
+%license %{gem_instdir rbs}/COPYING
+%{gem_instdir rbs}/Gemfile*
+%doc %{gem_instdir rbs}/README.md
+%{gem_instdir rbs}/Rakefile
+%{gem_instdir rbs}/Steepfile
+%{gem_instdir rbs}/core
+%doc %{gem_instdir rbs}/docs
+%{gem_instdir rbs}/exe
+%{gem_instdir rbs}/goodcheck.yml
+%{gem_libdir rbs}
+%{gem_instdir rbs}/schema
+%{gem_instdir rbs}/sig
+%{gem_instdir rbs}/stdlib
+%{gem_spec rbs}
 
 %files -n rubygem-test-unit
-%dir %{gem_dir}/gems/test-unit-%{test_unit_version}
-%license %{gem_dir}/gems/test-unit-%{test_unit_version}/BSDL
-%license %{gem_dir}/gems/test-unit-%{test_unit_version}/COPYING
-%license %{gem_dir}/gems/test-unit-%{test_unit_version}/PSFL
-%{gem_dir}/gems/test-unit-%{test_unit_version}/lib
-%{gem_dir}/gems/test-unit-%{test_unit_version}/sample
-%{gem_dir}/specifications/test-unit-%{test_unit_version}.gemspec
-%doc %{gem_dir}/gems/test-unit-%{test_unit_version}/README.md
-%{gem_dir}/gems/test-unit-%{test_unit_version}/Rakefile
-%doc %{gem_dir}/gems/test-unit-%{test_unit_version}/doc
+%dir %{gem_instdir test-unit}
+%license %{gem_instdir test-unit}/BSDL
+%license %{gem_instdir test-unit}/COPYING
+%license %{gem_instdir test-unit}/PSFL
+%{gem_libdir test-unit}
+%{gem_instdir test-unit}/sample
+%{gem_spec test-unit}
+%doc %{gem_instdir test-unit}/README.md
+%{gem_instdir test-unit}/Rakefile
+%doc %{gem_instdir test-unit}/doc
 
 %files -n rubygem-rexml
-%dir %{gem_dir}/gems/rexml-%{rexml_version}
-%license %{gem_dir}/gems/rexml-%{rexml_version}/LICENSE.txt
-%doc %{gem_dir}/gems/rexml-%{rexml_version}/NEWS.md
-%doc %{gem_dir}/gems/rexml-%{rexml_version}/doc
-%{gem_dir}/gems/rexml-%{rexml_version}/lib
-%{gem_dir}/specifications/rexml-%{rexml_version}.gemspec
-%doc %{gem_dir}/gems/rexml-%{rexml_version}/README.md
+%dir %{gem_instdir rexml}
+%license %{gem_instdir rexml}/LICENSE.txt
+%doc %{gem_instdir rexml}/NEWS.md
+%doc %{gem_instdir rexml}/doc
+%{gem_libdir rexml}
+%{gem_spec rexml}
+%doc %{gem_instdir rexml}/README.md
 
 %files -n rubygem-rss
-%dir %{gem_dir}/gems/rss-%{rss_version}
-%exclude %{gem_dir}/gems/rss-%{rss_version}/.*
-%license %{gem_dir}/gems/rss-%{rss_version}/LICENSE.txt
-%doc %{gem_dir}/gems/rss-%{rss_version}/NEWS.md
-%{gem_dir}/gems/rss-%{rss_version}/lib
-%{gem_dir}/specifications/rss-%{rss_version}.gemspec
-%doc %{gem_dir}/gems/rss-%{rss_version}/README.md
+%dir %{gem_instdir rss}
+%exclude %{gem_instdir rss}/.*
+%license %{gem_instdir rss}/LICENSE.txt
+%doc %{gem_instdir rss}/NEWS.md
+%{gem_libdir rss}
+%{gem_spec rss}
+%doc %{gem_instdir rss}/README.md
 
 %files -n rubygem-typeprof
-%dir %{gem_dir}/gems/typeprof-%{typeprof_version}
+%dir %{gem_instdir typeprof}
 %{_bindir}/typeprof
-%exclude %{gem_dir}/gems/typeprof-%{typeprof_version}/.*
-%license %{gem_dir}/gems/typeprof-%{typeprof_version}/LICENSE
-%{gem_dir}/gems/typeprof-%{typeprof_version}/exe
-%{gem_dir}/gems/typeprof-%{typeprof_version}/lib
-%doc %{gem_dir}/gems/typeprof-%{typeprof_version}/tools
-%exclude %{gem_dir}/gems/typeprof-%{typeprof_version}/typeprof-lsp
-%{gem_dir}/specifications/typeprof-%{typeprof_version}.gemspec
-%doc %{gem_dir}/gems/typeprof-%{typeprof_version}/Gemfile*
-%doc %{gem_dir}/gems/typeprof-%{typeprof_version}/README.md
-%doc %{gem_dir}/gems/typeprof-%{typeprof_version}/Rakefile
+%exclude %{gem_instdir typeprof}/.*
+%license %{gem_instdir typeprof}/LICENSE
+%{gem_instdir typeprof}/exe
+%{gem_libdir typeprof}
+%doc %{gem_instdir typeprof}/tools
+%exclude %{gem_instdir typeprof}/typeprof-lsp
+%{gem_spec typeprof}
+%doc %{gem_instdir typeprof}/Gemfile*
+%doc %{gem_instdir typeprof}/README.md
+%doc %{gem_instdir typeprof}/Rakefile
 
 
 %changelog