diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index d2399ca..a59f941 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 /*/
 /ruby-*.tar.xz
-/rexml-*.gem
 /*.rpm
-
-!/plans/
diff --git a/macros.rubygems b/macros.rubygems
index 7146c77..3f72b14 100644
--- a/macros.rubygems
+++ b/macros.rubygems
@@ -2,55 +2,14 @@
 %gem_dir %{_datadir}/gems
 %gem_archdir %{_libdir}/gems
 
-# %gem_prerelease - Provides prerelease string if available.
-#
-# Usage: %gem_prerelease [custom_gem_name]
-#
-# If avilable, prints prerelease string, which is a %prerelease macro by
-# default. When [custom_gem_name] is provided, the custom_gem_name is used to
-# derive %custom_gem_name_prerelease macro, which can be predefined.
-#
-# Please note that for the prerelease macros are the dashes in
-# [custom_gem_name] replaced by underscores.
-#
-%gem_prerelease() %{?1:%{expand:%%{?%{gsub %{1} - _}_prerelease}}}%{!?1:%{?prerelease}}
-
-# %gem_version - Provides version string (including prerelease if available).
-#
-# Usage: %gem_version [custom_gem_name]
-#
-# Prints version (including prerelease string), that is %version macro by
-# default. When [custom_gem_name] is provided, the custom_gem_name is used to
-# derive %custom_gem_name_version macro which needs to be predefined.
-#
-# Please note that for the version macros are the dashes in [custom_gem_name]
-# replaced by underscores.
-#
-%gem_version() %{?1:%{expand:%{%{gsub %{1} - _}_version}}}%{!?1:%{version}}%{gem_prerelease %{?1}}
-
-# %gem_name_version - Provides gem_name-version string.
-#
-# Usage: %gem_name_version [custom_gem_name]
-#
-# Prints gem_name-version string, by default joining %gem_name, %version and
-# %prerelease macros. When [custom_gem_name] is provided, the
-# custom_gem_name is joined with version as provided by %gem_version macro.
-#
-%gem_name_version() %{?1}%{!?1:%{gem_name}}-%{gem_version %{?1}}
-
 # Common gem locations and files.
-#
-# These macros leverages %gem_name_version macro and accepts custom gem_name.
-#
-# -d                 Use default gem install location.
-#
-%gem_instdir() %{gem_dir}/gems/%{gem_name_version %{?1}}
-%gem_extdir_mri() %{gem_archdir}/%{name}/%{gem_name_version %{?1}}
-%gem_libdir() %{gem_instdir %{?1}}/lib
-%gem_cache() %{gem_dir}/cache/%{gem_name_version %{?1}}.gem
-%gem_spec(d) %{gem_dir}/specifications%{?-d:/default}/%{gem_name_version %{?1}}.gemspec
-%gem_docdir() %{gem_dir}/doc/%{gem_name_version %{?1}}
-%gem_plugin() %{gem_dir}/plugins/%{?1}%{!?1:%{gem_name}}_plugin.rb
+%gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}%{?prerelease}
+%gem_extdir_mri %{gem_archdir}/%{name}/%{gem_name}-%{version}%{?prerelease}
+%gem_libdir %{gem_instdir}/lib
+%gem_cache %{gem_dir}/cache/%{gem_name}-%{version}%{?prerelease}.gem
+%gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}%{?prerelease}.gemspec
+%gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}%{?prerelease}
+%gem_plugin %{gem_dir}/plugins/%{gem_name}_plugin.rb
 
 
 # %gem_install - Install gem into appropriate directory.
@@ -63,7 +22,7 @@
 %gem_install(d:n:) \
 mkdir -p %{-d*}%{!?-d:.%{gem_dir}} \
 \
-CONFIGURE_ARGS="--with-cflags='%{optflags}' --with-cxxflags='%{optflags}' --with-ldflags='%{build_ldflags}' $CONFIGURE_ARGS" \\\
+CONFIGURE_ARGS="--with-cflags='%{optflags}' --with-cxxflags='%{optflags}' $CONFIGURE_ARGS" \\\
 gem install \\\
         -V \\\
         --local \\\
diff --git a/operating_system.rb b/operating_system.rb
index fd56386..d95b303 100644
--- a/operating_system.rb
+++ b/operating_system.rb
@@ -87,51 +87,41 @@ module Gem
     # Remove methods we are going to override. This avoids "method redefined;"
     # warnings otherwise issued by Ruby.
 
+    remove_method :operating_system_defaults if method_defined? :operating_system_defaults
     remove_method :default_dir if method_defined? :default_dir
-    remove_method :default_specifications_dir if method_defined? :default_specifications_dir
     remove_method :default_path if method_defined? :default_path
-    remove_method :default_bindir if method_defined? :default_bindir
     remove_method :default_ext_dir_for if method_defined? :default_ext_dir_for
 
+    ##
+    # Regular user installs into user directory, root manages /usr/local.
+
+    def operating_system_defaults
+      unless opt_build_root?
+        options = if Process.uid == 0
+          "--install-dir=#{Gem.default_dirs[:local][:gem_dir]} --bindir #{Gem.default_dirs[:local][:bin_dir]}"
+        else
+          "--user-install --bindir #{File.join [Dir.home, 'bin']}"
+        end
+
+        {"gem" => options}
+      else
+        {}
+      end
+    end
+
     ##
     # RubyGems default overrides.
 
     def default_dir
-      if opt_build_root?
-        Gem.default_dirs[:system][:gem_dir]
-      elsif Process.uid == 0
-        Gem.default_dirs[:local][:gem_dir]
-      else
-        Gem.user_dir
-      end
+      Gem.default_dirs[:system][:gem_dir]
     end
 
-    ##
-    # Path to specification files of default gems.
-
-    def default_specifications_dir
-      @default_specifications_dir ||= File.join(Gem.default_dirs[:system][:gem_dir], "specifications", "default")
-    end
-
-    ##
-    # Default gem load path
-
     def default_path
       path = default_dirs.collect {|location, paths| paths[:gem_dir]}
       path.unshift Gem.user_dir if File.exist? Gem.user_home
       path
     end
 
-    def default_bindir
-      if opt_build_root?
-        Gem.default_dirs[:system][:bin_dir]
-      elsif Process.uid == 0
-        Gem.default_dirs[:local][:bin_dir]
-      else
-        File.join [Dir.home, 'bin']
-      end
-    end
-
     def default_ext_dir_for base_dir
       dir = if rpmbuild?
         build_dir = base_dir.chomp Gem.default_dirs[:system][:gem_dir]
diff --git a/plans/all.fmf b/plans/all.fmf
deleted file mode 100644
index 7b06cfb..0000000
--- a/plans/all.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan with all Fedora tests
-discover:
-   how: fmf
-   url: https://src.fedoraproject.org/tests/ruby.git
-execute:
-   how: tmt
diff --git a/rdoc-pr1531-fix-mutilple-document-installation.patch b/rdoc-pr1531-fix-mutilple-document-installation.patch
deleted file mode 100644
index 192863f..0000000
--- a/rdoc-pr1531-fix-mutilple-document-installation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 994ee4c17fb8c217ab0335df55620c6bdb5d5cbe Mon Sep 17 00:00:00 2001
-From: tompng <tomoyapenguin@gmail.com>
-Date: Fri, 26 Dec 2025 04:57:12 +0900
-Subject: [PATCH] Fix comment_location for merged ClassModule
-
----
- lib/rdoc/code_object/class_module.rb       | 7 ++++++-
- test/rdoc/code_object/class_module_test.rb | 6 ++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib/rdoc/code_object/class_module.rb b/lib/rdoc/code_object/class_module.rb
-index b6bed352a2..d7ee36f950 100644
---- a/lib/rdoc/code_object/class_module.rb
-+++ b/lib/rdoc/code_object/class_module.rb
-@@ -477,7 +477,12 @@ def merge(class_module)
-       document = document.merge other_document
- 
-       @comment = RDoc::Comment.from_document(document)
--      @comment_location = document
-+
-+      @comment_location = if document.parts.first.is_a?(RDoc::Markup::Document)
-+                            document.parts.map { |doc| [doc, doc.file] }
-+                          else
-+                            [[document, document.file]]
-+                          end
-     end
- 
-     cm = class_module
diff --git a/rpm_test_helper.rb b/rpm_test_helper.rb
deleted file mode 100644
index 671ca55..0000000
--- a/rpm_test_helper.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-require 'tmpdir'
-require 'tempfile'
-require 'fileutils'
-# Available in Ruby upstream sources under tool/lib/envutil.rb
-# Required for finding and setting up the built ruby binary.
-require 'envutil'
-
-module RPMTestHelper
-  def setup
-    @tmpdir = Dir.mktmpdir
-    @tempfiles = []
-  end
-
-  def teardown
-    @tempfiles.each do |file|
-      file.close
-      file.unlink
-    end
-
-    FileUtils.rmtree(@tmpdir)
-  end
-
-  GENERATOR_SCRIPT = ENV['GENERATOR_SCRIPT'].clone.freeze
-  if GENERATOR_SCRIPT.nil? || GENERATOR_SCRIPT == ''
-    raise "GENERATOR_SCRIPT is not specified." \
-      "Specify the ENV variable with absolute path to the generator."
-  end
-
-  Dependency = Struct.new('Dependency', :name, :requirements) do
-    def to_rpm_str
-      "rubygem(#{self.name})"
-    end
-  end
-
-  def make_gemspec(gem_info)
-    file = Tempfile.new('req_gemspec', @tmpdir)
-    # Fake gemspec with enough to pass most checks
-    # Rubygems uses to validate the format.
-    gemspec_contents = <<~EOF
-      # -*- encoding: utf-8 -*-
-      # stub: #{gem_info.name} #{gem_info.version} ruby lib
-
-      Gem::Specification.new do |s|
-        s.name = "#{gem_info.name}".freeze
-        s.version = "#{gem_info.version}"
-
-        s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-        s.require_paths = ["lib".freeze]
-        s.authors = ["John Doe".freeze]
-        s.bindir = "bin".freeze
-        s.date = "2023-12-15"
-        s.description = "Fake gemspec helper for testing Rubygem Generators".freeze
-        s.email = ["example@example.com".freeze]
-        s.files = ["LICENSE.txt".freeze, "lib/#{gem_info.name}.rb".freeze, "#{gem_info.name}.gemspec".freeze]
-        s.homepage = "https://pkgs.fedoraproject.org/rpms/ruby".freeze
-        s.licenses = ["MIT".freeze]
-        s.required_ruby_version = Gem::Requirement.new(">= 2.5.0".freeze)
-        s.rubygems_version = "3.3.5".freeze
-        s.summary = "Fake gemspec for testing Rubygem Generators".freeze
-
-        if s.respond_to? :specification_version then
-          s.specification_version = 4
-        end
-
-        if s.respond_to? :add_runtime_dependency then
-          #{gem_info.gemspec_runtime_dep_str}
-        else
-          #{gem_info.gemspec_dep_str}
-        end
-      end
-    EOF
-
-    file.write gemspec_contents
-    file.rewind
-    @tempfiles << file
-    file
-  end
-
-  # Caller is expected to close subprocess stdin via #close_write
-  # in order to let subprocess proceed if the process is reading
-  # from STDIN in a loop.
-  def rb_subprocess(*args)
-    args = [GENERATOR_SCRIPT] if args.empty?
-    ruby = EnvUtil.rubybin
-    f = IO.popen([ruby] + args, 'r+') #, external_encoding: external_encoding)
-    yield(f)
-  ensure
-    f.close unless !f || f.closed?
-  end
-
-  def run_generator_single_file(gem_info)
-    lines = []
-    gemspec_f = make_gemspec(gem_info)
-
-    rb_subprocess do |io|
-      io.write gemspec_f.path
-      io.close_write
-      lines = io.readlines
-    end
-
-    lines
-  end
-
-  def helper_rubygems_dependency
-    "ruby(rubygems)"
-  end
-
-  class GemInfo
-    attr_accessor :name, :version, :dependencies
-
-    def initialize(name: 'foo', version: '1.2.3', dependencies: [])
-      @name = name
-      @version = version
-      @dependencies = dependencies
-    end
-
-    def dependencies=(other)
-      raise ArgumentError, "#{self.class.name}##{__method__.to_s}: Expected array of `Dependency' elements" \
-        unless other.is_a?(Array) && other.all? { |elem| elem.respond_to?(:name) && elem.respond_to?(:requirements) }
-
-      @dependencies = other
-    end
-
-    def to_rpm_str
-      "rubygem(#{self.name})"
-    end
-
-    def gemspec_dep_str
-      return '' if self.dependencies.nil? || self.dependencies.empty?
-      @dependencies.inject("") do |memo, dep|
-        memo += if dep.requirements && !dep.requirements.empty?
-                  %Q|s.add_dependency(%q<#{dep.name}>.freeze, #{handle_dep_requirements(dep.requirements)})|
-                else
-                  %Q|s.add_dependency(%q<#{dep.name}>.freeze)|
-                end
-
-        memo += "\n"
-      end
-    end
-
-    def gemspec_runtime_dep_str
-      return '' if self.dependencies.nil? || self.dependencies.empty?
-
-      @dependencies.inject("") do |memo, dep|
-        memo += if dep.requirements && !dep.requirements.empty?
-                  %Q|s.add_runtime_dependency(%q<#{dep.name}>.freeze, #{handle_dep_requirements(dep.requirements)})|
-                else
-                  %Q|s.add_runtime_dependency(%q<#{dep.name}>.freeze)|
-                end
-
-        memo += "\n"
-      end
-    end
-
-    private
-
-    def handle_dep_requirements(reqs)
-      raise ArgumentError, "#{self.class.name}##{__method__.to_s}: Reqs must be an array." \
-        unless reqs.is_a? Array
-      raise ArgumentError, "#{self.class.name}##{__method__.to_s}: Reqs must not be empty for this method." \
-        if reqs.empty?
-
-      '[ "' + reqs.join('", "') + '" ]'
-    end
-  end
-end
diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch
new file mode 100644
index 0000000..b9c2c6f
--- /dev/null
+++ b/ruby-1.9.3-mkmf-verbose.patch
@@ -0,0 +1,25 @@
+From 28cc0749d6729aa2444661ee7b411e183fe220b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 19 Nov 2012 15:14:51 +0100
+Subject: [PATCH] Verbose mkmf.
+
+---
+ lib/mkmf.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/mkmf.rb b/lib/mkmf.rb
+index 682eb46..e6b1445 100644
+--- a/lib/mkmf.rb
++++ b/lib/mkmf.rb
+@@ -1930,7 +1930,7 @@ def configuration(srcdir)
+ SHELL = /bin/sh
+ 
+ # V=0 quiet, V=1 verbose.  other values don't work.
+-V = 0
++V = 1
+ Q1 = $(V:1=)
+ Q = $(Q1:0=@)
+ ECHO1 = $(V:1=@ #{CONFIG['NULLCMD']})
+-- 
+1.8.3.1
+
diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
index 8551d79..32806da 100644
--- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
@@ -1,4 +1,4 @@
-From e1293f665128b0d9c5bfa0b5beeab4afebf07e6a Mon Sep 17 00:00:00 2001
+From 07c666ba5c3360dd6f43605a8ac7c85c99c1721f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Tue, 1 Oct 2013 12:22:40 +0200
 Subject: [PATCH] Allow to configure libruby.so placement.
@@ -8,10 +8,10 @@ Subject: [PATCH] Allow to configure libruby.so placement.
  1 file changed, 5 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index a64358fada..b3bdfad1eb 100644
+index d261ea57b5..3c13076b82 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3556,6 +3556,11 @@ AS_IF([test ${multiarch+set}], [
+@@ -3240,6 +3240,11 @@ AS_IF([test ${multiarch+set}], [
  ])
  
  archlibdir='${libdir}/${arch}'
@@ -23,3 +23,6 @@ index a64358fada..b3bdfad1eb 100644
  sitearchlibdir='${libdir}/${sitearch}'
  archincludedir='${includedir}/${arch}'
  sitearchincludedir='${includedir}/${sitearch}'
+-- 
+2.22.0
+
diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
index 045d6ae..437d09f 100644
--- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
@@ -1,4 +1,4 @@
-From 6062f4976c5b51f8b952b9f6745175be7b1c5ff9 Mon Sep 17 00:00:00 2001
+From e24d97c938c481450ed80ec83e5399595946c1ae Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Fri, 8 Feb 2013 22:48:41 +0100
 Subject: [PATCH] Prevent duplicated paths when empty version string is
@@ -11,10 +11,10 @@ Subject: [PATCH] Prevent duplicated paths when empty version string is
  3 files changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2bc5153141..a64358fada 100644
+index c42436c23d..d261ea57b5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4472,7 +4472,8 @@ AS_CASE(["$ruby_version_dir_name"],
+@@ -3886,7 +3886,8 @@ AS_CASE(["$ruby_version_dir_name"],
  ruby_version_dir=/'${ruby_version_dir_name}'
  
  if test -z "${ruby_version_dir_name}"; then
@@ -25,7 +25,7 @@ index 2bc5153141..a64358fada 100644
  
  rubylibdir='${rubylibprefix}'${ruby_version_dir}
 diff --git a/loadpath.c b/loadpath.c
-index b8969e6998..bbfd4daa78 100644
+index 9160031..0d4d953 100644
 --- a/loadpath.c
 +++ b/loadpath.c
 @@ -65,21 +65,33 @@ const char ruby_initial_load_paths[] =
@@ -63,7 +63,7 @@ index b8969e6998..bbfd4daa78 100644
  
      RUBY_LIB "\0"
 diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
-index db74115730..2b01796abf 100755
+index 07076d4..35e6c3c 100755
 --- a/tool/mkconfig.rb
 +++ b/tool/mkconfig.rb
 @@ -114,7 +114,7 @@
@@ -75,3 +75,6 @@ index db74115730..2b01796abf 100755
      when /^ARCH_FLAG$/
        val = "arch_flag || #{val}" if universal
      when /^UNIVERSAL_ARCHNAMES$/
+-- 
+1.9.0
+
diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch
index 6ecfb2e..46584d7 100644
--- a/ruby-2.1.0-always-use-i386.patch
+++ b/ruby-2.1.0-always-use-i386.patch
@@ -1,4 +1,4 @@
-From 9e70f6e4b8771965a30ecfb6d1c6015df350ca55 Mon Sep 17 00:00:00 2001
+From 2089cab72b38d6d5e7ba2b596e41014209acad30 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Mon, 19 Nov 2012 14:37:28 +0100
 Subject: [PATCH] Always use i386.
@@ -8,10 +8,10 @@ Subject: [PATCH] Always use i386.
  1 file changed, 2 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index b3bdfad1eb..411322a27f 100644
+index 3c13076b82..93af30321d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4536,6 +4536,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -3950,6 +3950,8 @@ AC_SUBST(vendorarchdir)dnl
  AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
  AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
  
@@ -20,3 +20,6 @@ index b3bdfad1eb..411322a27f 100644
  AS_IF([test "${universal_binary-no}" = yes ], [
      arch="universal-${target_os}"
      AS_IF([test "${rb_cv_architecture_available}" = yes], [
+-- 
+1.8.3.1
+
diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch
index 969fefa..6946429 100644
--- a/ruby-2.1.0-custom-rubygems-location.patch
+++ b/ruby-2.1.0-custom-rubygems-location.patch
@@ -1,4 +1,4 @@
-From c7952996ac9738a14bea0a1a971fea13460a6c94 Mon Sep 17 00:00:00 2001
+From 94da59aafacc6a9efe829529eb51385588d6f149 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Fri, 11 Nov 2011 13:14:45 +0100
 Subject: [PATCH] Allow to install RubyGems into custom location, outside of
@@ -12,10 +12,10 @@ Subject: [PATCH] Allow to install RubyGems into custom location, outside of
  4 files changed, 22 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 411322a27f..b5f842a512 100644
+index 93af30321d..bc13397e0e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4508,6 +4508,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -3922,6 +3922,10 @@ AC_ARG_WITH(vendorarchdir,
              [vendorarchdir=$withval],
              [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
  
@@ -26,7 +26,7 @@ index 411322a27f..b5f842a512 100644
  AS_IF([test "${LOAD_RELATIVE+set}"], [
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
      RUBY_EXEC_PREFIX=''
-@@ -4532,6 +4536,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -3946,6 +3950,7 @@ AC_SUBST(sitearchdir)dnl
  AC_SUBST(vendordir)dnl
  AC_SUBST(vendorlibdir)dnl
  AC_SUBST(vendorarchdir)dnl
@@ -35,7 +35,7 @@ index 411322a27f..b5f842a512 100644
  AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
  AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
 diff --git a/loadpath.c b/loadpath.c
-index bbfd4daa78..69677a9297 100644
+index 623dc9d..74c5d9e 100644
 --- a/loadpath.c
 +++ b/loadpath.c
 @@ -94,6 +94,10 @@ const char ruby_initial_load_paths[] =
@@ -50,7 +50,7 @@ index bbfd4daa78..69677a9297 100644
  #ifdef RUBY_THINARCH
      RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
 diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl
-index 9ba2bd6de5..4ec4ce9353 100644
+index 79c003e..34f2382 100644
 --- a/template/verconf.h.tmpl
 +++ b/template/verconf.h.tmpl
 @@ -36,6 +36,9 @@
@@ -64,10 +64,10 @@ index 9ba2bd6de5..4ec4ce9353 100644
  % R = {}
  % R["ruby_version"] = '"RUBY_LIB_VERSION"'
 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
-index a9e6365b27..7117e65e82 100755
+index e9110a17ca..76a1f0a315 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -393,6 +393,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -349,6 +349,7 @@ def CONFIG.[](name, mandatory = false)
    vendorlibdir = CONFIG["vendorlibdir"]
    vendorarchlibdir = CONFIG["vendorarchdir"]
  end
@@ -75,7 +75,7 @@ index a9e6365b27..7117e65e82 100755
  mandir = CONFIG["mandir", true]
  docdir = CONFIG["docdir", true]
  enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -1082,7 +1083,16 @@ def (bins = []).add(name)
+@@ -581,7 +582,16 @@ def stub
  install?(:local, :comm, :lib) do
    prepare "library scripts", rubylibdir
    noinst = %w[*.txt *.rdoc *.gemspec]
@@ -92,3 +92,6 @@ index a9e6365b27..7117e65e82 100755
  end
  
  install?(:local, :comm, :hdr, :'comm-hdr') do
+-- 
+1.8.3.1
+
diff --git a/ruby-2.3.0-ruby_version-Add-ruby_version_dir_name-support-for-RDoc.patch b/ruby-2.3.0-ruby_version-Add-ruby_version_dir_name-support-for-RDoc.patch
deleted file mode 100644
index 82f5963..0000000
--- a/ruby-2.3.0-ruby_version-Add-ruby_version_dir_name-support-for-RDoc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f833e213596b0bcfad8264a555eb5093303fb5f2 Mon Sep 17 00:00:00 2001
-From: Jarek Prokop <jprokop@redhat.com>
-Date: Thu, 25 Sep 2025 12:26:39 +0200
-Subject: [PATCH] Add ruby_version_dir_name support for RDoc.
-
----
- lib/rdoc/ri/paths.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
-index 8e89b04e..731f9e36 100644
---- a/lib/rdoc/ri/paths.rb
-+++ b/lib/rdoc/ri/paths.rb
-@@ -10,7 +10,7 @@ module RDoc::RI::Paths
-   #:stopdoc:
-   require 'rbconfig'
- 
--  version = RbConfig::CONFIG['ruby_version']
-+  version = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
- 
-   BASE    = File.join RbConfig::CONFIG['ridir'], version
- 
diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch
index 2eb5d00..fd545e5 100644
--- a/ruby-2.3.0-ruby_version.patch
+++ b/ruby-2.3.0-ruby_version.patch
@@ -1,4 +1,4 @@
-From 5406ea4b4b13db747e5c1f8341bb257b4da04435 Mon Sep 17 00:00:00 2001
+From 4fc1be3af3f58621bb751c9e63c208b15c0e8d16 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Tue, 31 Mar 2015 16:21:04 +0200
 Subject: [PATCH 1/4] Use ruby_version_dir_name for versioned directories.
@@ -12,15 +12,15 @@ ruby_version_dir_name now specifies custom version string for versioned
 directories, e.g. instead of default X.Y.Z, you can specify whatever
 string.
 ---
- configure.ac        | 66 ++++++++++++++++++++++++---------------------
+ configure.ac        | 64 ++++++++++++++++++++++++---------------------
  template/ruby.pc.in |  1 +
- 2 files changed, 36 insertions(+), 31 deletions(-)
+ 2 files changed, 35 insertions(+), 30 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2bbce78fd0..9d8662369c 100644
+index 80b137e380..63cd3b4f8b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4422,9 +4422,6 @@ AS_CASE(["$target_os"],
+@@ -3837,9 +3837,6 @@ AS_CASE(["$target_os"],
      rubyw_install_name='$(RUBYW_INSTALL_NAME)'
      ])
  
@@ -30,7 +30,7 @@ index 2bbce78fd0..9d8662369c 100644
  rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
  AC_ARG_WITH(rubyarchprefix,
  	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
-@@ -4447,57 +4444,63 @@ AC_ARG_WITH(ridir,
+@@ -3862,56 +3859,62 @@ AC_ARG_WITH(ridir,
  AC_SUBST(ridir)
  AC_SUBST(RI_BASE_NAME)
  
@@ -46,7 +46,6 @@ index 2bbce78fd0..9d8662369c 100644
 -AS_IF([test ${RUBY_LIB_VERSION_STYLE+set}], [
 -    {
 -    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
--    echo '@%:@include "confdefs.h"'
 -    echo '#define STRINGIZE(x) x'
 -    test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
 -    echo '#include "version.h"'
@@ -62,7 +61,6 @@ index 2bbce78fd0..9d8662369c 100644
 +RUBY_LIB_VERSION_STYLE='3	/* full */'
 +{
 +echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
-+echo '@%:@include "confdefs.h"'
 +echo '#define STRINGIZE(x) x'
 +test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
 +echo '#include "version.h"'
@@ -122,7 +120,7 @@ index 2bbce78fd0..9d8662369c 100644
  
  AS_IF([test "${LOAD_RELATIVE+set}"], [
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-@@ -4514,6 +4517,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -3928,6 +3931,7 @@ AC_SUBST(sitearchincludedir)dnl
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
@@ -131,32 +129,49 @@ index 2bbce78fd0..9d8662369c 100644
  AC_SUBST(rubyarchdir)dnl
  AC_SUBST(sitedir)dnl
 diff --git a/template/ruby.pc.in b/template/ruby.pc.in
-index 6901ec2320..9b7b787208 100644
+index 8a2c066..c81b211 100644
 --- a/template/ruby.pc.in
 +++ b/template/ruby.pc.in
-@@ -2,6 +2,7 @@ MAJOR=@MAJOR@
+@@ -9,6 +9,7 @@ MAJOR=@MAJOR@
  MINOR=@MINOR@
  TEENY=@TEENY@
  ruby_version=@ruby_version@
 +ruby_version_dir_name=@ruby_version_dir_name@
  RUBY_API_VERSION=@RUBY_API_VERSION@
  RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
- arch=@arch@
+ RUBY_BASE_NAME=@RUBY_BASE_NAME@
+-- 
+2.1.0
 
-From baff562149499973123d2187620201be641c6538 Mon Sep 17 00:00:00 2001
+
+From 518850aba6eee76de7715aae8d37330e34b01983 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Tue, 31 Mar 2015 16:37:26 +0200
 Subject: [PATCH 2/4] Add ruby_version_dir_name support for RDoc.
 
 ---
- tool/rbinstall.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ lib/rdoc/ri/paths.rb | 2 +-
+ tool/rbinstall.rb    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
+index 970cb91..5bf8230 100644
+--- a/lib/rdoc/ri/paths.rb
++++ b/lib/rdoc/ri/paths.rb
+@@ -10,7 +10,7 @@ module RDoc::RI::Paths
+   #:stopdoc:
+   require 'rbconfig'
+ 
+-  version = RbConfig::CONFIG['ruby_version']
++  version = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+ 
+   BASE    = File.join RbConfig::CONFIG['ridir'], version
+ 
 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
-index 874c3ef1d9..a9e6365b27 100755
+index d4c110e..d39c9a6 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -1053,7 +1053,7 @@ def (bins = []).add(name)
+@@ -439,7 +439,7 @@ def CONFIG.[](name, mandatory = false)
  
  install?(:doc, :rdoc) do
    if $rdocdir
@@ -165,74 +180,87 @@ index 874c3ef1d9..a9e6365b27 100755
      prepare "rdoc", ridatadir
      install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
    end
+-- 
+2.23.0
 
-From 7cf872a9a34f38d71cd2ca04ac114b4ea85cc56c Mon Sep 17 00:00:00 2001
+
+From 9f0ec0233f618cbb862629816b22491c3df79578 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Tue, 31 Mar 2015 16:37:44 +0200
 Subject: [PATCH 3/4] Add ruby_version_dir_name support for RubyGems.
 
 ---
- lib/rubygems/defaults.rb  | 7 ++++---
+ lib/rubygems/defaults.rb  | 9 +++++----
  test/rubygems/test_gem.rb | 5 +++--
- 2 files changed, 7 insertions(+), 5 deletions(-)
+ 2 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
-index 90f09fc191..f6b8a03b95 100644
+index d4ff4a262c..3f9a5bf590 100644
 --- a/lib/rubygems/defaults.rb
 +++ b/lib/rubygems/defaults.rb
-@@ -35,7 +35,7 @@ def self.default_spec_cache_dir
-   # specified in the environment
+@@ -38,13 +38,13 @@ def self.default_dir
+              [
+                File.dirname(RbConfig::CONFIG['sitedir']),
+                'Gems',
+-               RbConfig::CONFIG['ruby_version'],
++               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+              ]
+            else
+              [
+                RbConfig::CONFIG['rubylibprefix'],
+                'gems',
+-               RbConfig::CONFIG['ruby_version'],
++               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+              ]
+            end
  
-   def self.default_dir
--    @default_dir ||= File.join(RbConfig::CONFIG["rubylibprefix"], "gems", RbConfig::CONFIG["ruby_version"])
-+    @default_dir ||= File.join(RbConfig::CONFIG["rubylibprefix"], "gems", RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"])
-   end
- 
-   ##
-@@ -104,7 +104,8 @@ def self.user_dir
+@@ -117,7 +117,8 @@ def self.user_dir
      gem_dir = File.join(Gem.user_home, ".gem")
      gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir)
      parts = [gem_dir, ruby_engine]
--    parts << RbConfig::CONFIG["ruby_version"] unless RbConfig::CONFIG["ruby_version"].empty?
-+    ruby_version_dir_name = RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
+-    parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
++    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 +    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
      File.join parts
    end
  
-@@ -265,7 +266,7 @@ def self.vendor_dir # :nodoc:
-     return nil unless RbConfig::CONFIG.key? "vendordir"
+@@ -252,7 +253,7 @@ def self.vendor_dir # :nodoc:
+     return nil unless RbConfig::CONFIG.key? 'vendordir'
  
-     File.join RbConfig::CONFIG["vendordir"], "gems",
--              RbConfig::CONFIG["ruby_version"]
-+              RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
+     File.join RbConfig::CONFIG['vendordir'], 'gems',
+-              RbConfig::CONFIG['ruby_version']
++              RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
    end
  
    ##
 diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
-index 74c8953904..1f3bd91d51 100644
+index b25068405d..e9fef4a311 100644
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
-@@ -1339,7 +1339,8 @@ def test_self_use_paths
+@@ -1440,7 +1440,8 @@ def test_self_use_paths
  
    def test_self_user_dir
-     parts = [@userhome, ".gem", Gem.ruby_engine]
--    parts << RbConfig::CONFIG["ruby_version"] unless RbConfig::CONFIG["ruby_version"].empty?
-+    ruby_version_dir_name = RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
+     parts = [@userhome, '.gem', Gem.ruby_engine]
+-    parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
++    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 +    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
  
      FileUtils.mkdir_p File.join(parts)
  
-@@ -1415,7 +1416,7 @@ def test_self_vendor_dir
-     vendordir(File.join(@tempdir, "vendor")) do
+@@ -1516,7 +1517,7 @@ def test_self_vendor_dir
+     vendordir(File.join(@tempdir, 'vendor')) do
        expected =
-         File.join RbConfig::CONFIG["vendordir"], "gems",
--                  RbConfig::CONFIG["ruby_version"]
-+                  RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
+         File.join RbConfig::CONFIG['vendordir'], 'gems',
+-                  RbConfig::CONFIG['ruby_version']
++                  RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
  
        assert_equal expected, Gem.vendor_dir
      end
+-- 
+2.1.0
 
-From 17cb98b7b78f8bfc511feffbe061747f676055b1 Mon Sep 17 00:00:00 2001
+
+From 88c38a030c22dbf9422ece847bdfbf87d6659313 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Wed, 1 Apr 2015 14:55:37 +0200
 Subject: [PATCH 4/4] Let headers directories follow the configured version
@@ -243,10 +271,10 @@ Subject: [PATCH 4/4] Let headers directories follow the configured version
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9d8662369c..2bc5153141 100644
+index a00f2b6776..999e2d6d5d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -151,7 +151,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+@@ -107,7 +107,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
  RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
  AC_SUBST(RUBY_BASE_NAME)
  AC_SUBST(RUBYW_BASE_NAME)
@@ -255,3 +283,6 @@ index 9d8662369c..2bc5153141 100644
  
  dnl checks for alternative programs
  AC_CANONICAL_BUILD
+-- 
+2.1.0
+
diff --git a/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch b/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
new file mode 100644
index 0000000..db6737d
--- /dev/null
+++ b/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
@@ -0,0 +1,30 @@
+From 346e147ba6480839b87046e9a9efab0bf6ed3660 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Wed, 10 Aug 2016 17:35:48 +0200
+Subject: [PATCH] Rely on ldd to detect glibc.
+
+This is just workaround, since we know we are quite sure this will be successful
+on Red Hat platforms.
+
+This workaround rhbz#1361037
+---
+ test/fiddle/helper.rb |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
+index 1da3d93..65148a1 100644
+--- a/test/fiddle/helper.rb
++++ b/test/fiddle/helper.rb
+@@ -139,6 +139,9 @@
+   libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
+ end
+ 
++# Just ignore the heuristic, because it is not reliable on all platforms.
++libc_so = libm_so = nil
++
+ if !libc_so || !libm_so
+   ruby = EnvUtil.rubybin
+   # When the ruby binary is 32-bit and the host is 64-bit,
+-- 
+2.9.2
+
diff --git a/ruby-2.7.0-Initialize-ABRT-hook.patch b/ruby-2.7.0-Initialize-ABRT-hook.patch
index 86d97fc..2b90d9e 100644
--- a/ruby-2.7.0-Initialize-ABRT-hook.patch
+++ b/ruby-2.7.0-Initialize-ABRT-hook.patch
@@ -1,4 +1,4 @@
-From 03b44a86b574dc0b63fd57c5f9b52b56ad3ced37 Mon Sep 17 00:00:00 2001
+From eca084e4079c77c061045df9c21b219175b05228 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Mon, 6 Jan 2020 13:56:04 +0100
 Subject: [PATCH] Initialize ABRT hook.
@@ -15,16 +15,15 @@ To keep the things simple for now, load the ABRT hook via C.
 [4]: https://github.com/ruby/ruby/pull/2735
 [5]: https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/
 ---
- abrt.c                                | 12 ++++++++++++
- common.mk                             |  1 +
- ruby.c                                |  4 ++++
- spec/ruby/core/kernel/require_spec.rb |  2 ++
- 4 files changed, 19 insertions(+)
+ abrt.c    | 12 ++++++++++++
+ common.mk |  3 ++-
+ ruby.c    |  4 ++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
  create mode 100644 abrt.c
 
 diff --git a/abrt.c b/abrt.c
 new file mode 100644
-index 0000000000..e99cb432e6
+index 0000000000..74b0bd5c0f
 --- /dev/null
 +++ b/abrt.c
 @@ -0,0 +1,12 @@
@@ -41,22 +40,24 @@ index 0000000000..e99cb432e6
 +  );
 +}
 diff --git a/common.mk b/common.mk
-index 08fee9119a..dae7d9dc00 100644
+index b2e5b2b6d0..f39f81da5c 100644
 --- a/common.mk
 +++ b/common.mk
-@@ -116,6 +116,7 @@ PRISM_FILES = prism/api_node.$(OBJEXT) \
- 		prism_init.$(OBJEXT)
+@@ -81,7 +81,8 @@ ENC_MK        = enc.mk
+ MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
+ 		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(mflags)
  
- COMMONOBJS    = \
-+		abrt.$(OBJEXT) \
- 		array.$(OBJEXT) \
+-COMMONOBJS    = array.$(OBJEXT) \
++COMMONOBJS    = abrt.$(OBJEXT) \
++                array.$(OBJEXT) \
  		ast.$(OBJEXT) \
  		bignum.$(OBJEXT) \
+ 		class.$(OBJEXT) \
 diff --git a/ruby.c b/ruby.c
-index b00fc1502d..32b88f7496 100644
+index 60c57d6259..1eec16f2c8 100644
 --- a/ruby.c
 +++ b/ruby.c
-@@ -1773,10 +1773,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
+@@ -1489,10 +1489,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
  
  void Init_builtin_features(void);
  
@@ -68,19 +69,9 @@ index b00fc1502d..32b88f7496 100644
  {
      Init_builtin_features();
 +    Init_abrt();
+     rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
  }
  
- void rb_call_builtin_inits(void);
-diff --git a/spec/ruby/core/kernel/require_spec.rb b/spec/ruby/core/kernel/require_spec.rb
-index 60d17242fe..a8f93b0db4 100644
---- a/spec/ruby/core/kernel/require_spec.rb
-+++ b/spec/ruby/core/kernel/require_spec.rb
-@@ -26,6 +26,8 @@
-     out = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems --disable-did-you-mean')
-     features = out.lines.map { |line| File.basename(line.chomp, '.*') }
- 
-+    # Ignore ABRT
-+    features -= %w[abrt]
-     # Ignore CRuby internals
-     features -= %w[encdb transdb windows_1252 windows_31j]
-     features.reject! { |feature| feature.end_with?('-fake') }
+-- 
+2.24.1
+
diff --git a/ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch b/ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
new file mode 100644
index 0000000..64e2114
--- /dev/null
+++ b/ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
@@ -0,0 +1,34 @@
+From 9b42fce32bff25e0569581f76f532b9d57865aef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 27 Jul 2020 14:56:05 +0200
+Subject: [PATCH] Timeout the test_bug_reporter_add witout raising error.
+
+While timeouting the threads might be still good idea, it does not seems
+the timeout impacts the TestBugReporter#test_bug_reporter_add result,
+because the output of the child process has been already collected
+earlier.
+
+It seems that when the system is under heavy load, the thread might not
+be sheduled to finish its processing. Even finishing the child process
+might take tens of seconds and therefore the test case finish might take
+a while.
+---
+ test/-ext-/bug_reporter/test_bug_reporter.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb
+index 628fcd0340..2c677cc8a7 100644
+--- a/test/-ext-/bug_reporter/test_bug_reporter.rb
++++ b/test/-ext-/bug_reporter/test_bug_reporter.rb
+@@ -21,7 +21,7 @@ def test_bug_reporter_add
+     args = ["--disable-gems", "-r-test-/bug_reporter",
+             "-C", tmpdir]
+     stdin = "register_sample_bug_reporter(12345); Process.kill :SEGV, $$"
+-    assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")
++    assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT", timeout_error: nil)
+   ensure
+     FileUtils.rm_rf(tmpdir) if tmpdir
+   end
+-- 
+2.27.0
+
diff --git a/ruby-3.1.0-Use-mmap-for-allocating-heap-pages-in-the-GC.patch b/ruby-3.1.0-Use-mmap-for-allocating-heap-pages-in-the-GC.patch
new file mode 100644
index 0000000..512be18
--- /dev/null
+++ b/ruby-3.1.0-Use-mmap-for-allocating-heap-pages-in-the-GC.patch
@@ -0,0 +1,359 @@
+From bcab8c3cd877506de75f50e0f9ed98827ed554b0 Mon Sep 17 00:00:00 2001
+From: Peter Zhu <peter@peterzhu.ca>
+Date: Tue, 23 Feb 2021 16:28:56 -0500
+Subject: [PATCH] Use mmap for allocating heap pages
+
+---
+ configure.ac                 |  16 ++++
+ gc.c                         | 149 ++++++++++++++++++++++++++---------
+ test/ruby/test_gc_compact.rb |  41 ++++++----
+ 3 files changed, 155 insertions(+), 51 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2dcebdde9f..b1b190004d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1944,6 +1944,7 @@ AC_CHECK_FUNCS(memmem)
+ AC_CHECK_FUNCS(mkfifo)
+ AC_CHECK_FUNCS(mknod)
+ AC_CHECK_FUNCS(mktime)
++AC_CHECK_FUNCS(mmap)
+ AC_CHECK_FUNCS(openat)
+ AC_CHECK_FUNCS(pipe2)
+ AC_CHECK_FUNCS(poll)
+@@ -2666,6 +2667,21 @@ main(int argc, char *argv[])
+ 	rb_cv_fork_with_pthread=yes)])
+     test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
+ ])
++
++AC_CHECK_HEADERS([sys/user.h])
++AS_IF([test "x$ac_cv_func_mmap" = xyes], [
++    AC_CACHE_CHECK([whether PAGE_SIZE is compile-time const], rb_cv_const_page_size,
++	[malloc_headers=`sed -n '/MALLOC_HEADERS_BEGIN/,/MALLOC_HEADERS_END/p' ${srcdir}/gc.c`
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$malloc_headers
++            typedef char conftest_page[PAGE_SIZE];
++        ]], [[]])],
++        [rb_cv_const_page_size=yes],
++        [rb_cv_const_page_size=no])])
++])
++AS_IF([test "x$rb_cv_const_page_size" = xyes],
++    [AC_DEFINE(HAVE_CONST_PAGE_SIZE, 1)],
++    [AC_DEFINE(HAVE_CONST_PAGE_SIZE, 0)]
++)
+ }
+ 
+ : "runtime section" && {
+diff --git a/gc.c b/gc.c
+index f6acf3e117..6f8e5f242d 100644
+--- a/gc.c
++++ b/gc.c
+@@ -32,6 +32,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
++/* MALLOC_HEADERS_BEGIN */
+ #ifndef HAVE_MALLOC_USABLE_SIZE
+ # ifdef _WIN32
+ #  define HAVE_MALLOC_USABLE_SIZE
+@@ -54,6 +55,12 @@
+ # endif
+ #endif
+ 
++#if !defined(PAGE_SIZE) && defined(HAVE_SYS_USER_H)
++/* LIST_HEAD conflicts with sys/queue.h on macOS */
++# include <sys/user.h>
++#endif
++/* MALLOC_HEADERS_END */
++
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+ #endif
+@@ -821,6 +828,25 @@ enum {
+     HEAP_PAGE_BITMAP_SIZE = (BITS_SIZE * HEAP_PAGE_BITMAP_LIMIT),
+     HEAP_PAGE_BITMAP_PLANES = 4 /* RGENGC: mark, unprotected, uncollectible, marking */
+ };
++#define HEAP_PAGE_ALIGN (1 << HEAP_PAGE_ALIGN_LOG)
++#define HEAP_PAGE_SIZE HEAP_PAGE_ALIGN
++
++#ifdef HAVE_MMAP
++# if HAVE_CONST_PAGE_SIZE
++/* If we have the HEAP_PAGE and it is a constant, then we can directly use it. */
++static const bool USE_MMAP_ALIGNED_ALLOC = (PAGE_SIZE <= HEAP_PAGE_SIZE);
++# elif defined(PAGE_MAX_SIZE) && (PAGE_MAX_SIZE <= HEAP_PAGE_SIZE)
++/* PAGE_SIZE <= HEAP_PAGE_SIZE */
++static const bool USE_MMAP_ALIGNED_ALLOC = true;
++# else
++/* Otherwise, fall back to determining if we can use mmap during runtime. */
++#  define USE_MMAP_ALIGNED_ALLOC (use_mmap_aligned_alloc != false)
++
++static bool use_mmap_aligned_alloc;
++# endif
++#elif !defined(__MINGW32__) && !defined(_WIN32)
++static const bool USE_MMAP_ALIGNED_ALLOC = false;
++#endif
+ 
+ struct heap_page {
+     short total_slots;
+@@ -1760,14 +1786,14 @@ heap_unlink_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *pag
+     heap->total_slots -= page->total_slots;
+ }
+ 
+-static void rb_aligned_free(void *ptr);
++static void rb_aligned_free(void *ptr, size_t size);
+ 
+ static void
+ heap_page_free(rb_objspace_t *objspace, struct heap_page *page)
+ {
+     heap_allocated_pages--;
+     objspace->profile.total_freed_pages++;
+-    rb_aligned_free(GET_PAGE_BODY(page->start));
++    rb_aligned_free(GET_PAGE_BODY(page->start), HEAP_PAGE_SIZE);
+     free(page);
+ }
+ 
+@@ -1819,7 +1845,7 @@ heap_page_allocate(rb_objspace_t *objspace)
+     /* assign heap_page entry */
+     page = calloc1(sizeof(struct heap_page));
+     if (page == 0) {
+-        rb_aligned_free(page_body);
++        rb_aligned_free(page_body, HEAP_PAGE_SIZE);
+ 	rb_memerror();
+     }
+ 
+@@ -3159,15 +3185,18 @@ Init_heap(void)
+ {
+     rb_objspace_t *objspace = &rb_objspace;
+ 
+-#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
+-    /* If Ruby's heap pages are not a multiple of the system page size, we
+-     * cannot use mprotect for the read barrier, so we must disable automatic
+-     * compaction. */
+-    int pagesize;
+-    pagesize = (int)sysconf(_SC_PAGE_SIZE);
+-    if ((HEAP_PAGE_SIZE % pagesize) != 0) {
+-        ruby_enable_autocompact = 0;
+-    }
++#if defined(HAVE_MMAP) && !HAVE_CONST_PAGE_SIZE && !defined(PAGE_MAX_SIZE)
++    /* Need to determine if we can use mmap at runtime. */
++# ifdef PAGE_SIZE
++    /* If the PAGE_SIZE macro can be used. */
++    use_mmap_aligned_alloc = PAGE_SIZE <= HEAP_PAGE_SIZE;
++# elif defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
++    /* If we can use sysconf to determine the page size. */
++    use_mmap_aligned_alloc = sysconf(_SC_PAGE_SIZE) <= HEAP_PAGE_SIZE;
++# else
++    /* Otherwise we can't determine the system page size, so don't use mmap. */
++    use_mmap_aligned_alloc = FALSE;
++# endif
+ #endif
+ 
+     objspace->next_object_id = INT2FIX(OBJ_ID_INITIAL);
+@@ -8533,6 +8562,14 @@ gc_start_internal(rb_execution_context_t *ec, VALUE self, VALUE full_mark, VALUE
+ 
+     /* For now, compact implies full mark / sweep, so ignore other flags */
+     if (RTEST(compact)) {
++        /* If not MinGW, Windows, or does not have mmap, we cannot use mprotect for
++         * the read barrier, so we must disable compaction. */
++#if !defined(__MINGW32__) && !defined(_WIN32)
++        if (!USE_MMAP_ALIGNED_ALLOC) {
++            rb_raise(rb_eNotImpError, "Compaction isn't available on this platform");
++        }
++#endif
++
+         reason |= GPR_FLAG_COMPACT;
+     } else {
+         if (!RTEST(full_mark))       reason &= ~GPR_FLAG_FULL_MARK;
+@@ -9944,16 +9981,14 @@ gc_disable(rb_execution_context_t *ec, VALUE _)
+ static VALUE
+ gc_set_auto_compact(rb_execution_context_t *ec, VALUE _, VALUE v)
+ {
+-#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
+-    /* If Ruby's heap pages are not a multiple of the system page size, we
+-     * cannot use mprotect for the read barrier, so we must disable automatic
+-     * compaction. */
+-    int pagesize;
+-    pagesize = (int)sysconf(_SC_PAGE_SIZE);
+-    if ((HEAP_PAGE_SIZE % pagesize) != 0) {
++    /* If not MinGW, Windows, or does not have mmap, we cannot use mprotect for
++     * the read barrier, so we must disable automatic compaction. */
++#if !defined(__MINGW32__) && !defined(_WIN32)
++    if (!USE_MMAP_ALIGNED_ALLOC) {
+         rb_raise(rb_eNotImpError, "Automatic compaction isn't available on this platform");
+     }
+ #endif
++
+     ruby_enable_autocompact = RTEST(v);
+     return v;
+ }
+@@ -10350,22 +10385,54 @@ rb_aligned_malloc(size_t alignment, size_t size)
+ #elif defined _WIN32
+     void *_aligned_malloc(size_t, size_t);
+     res = _aligned_malloc(size, alignment);
+-#elif defined(HAVE_POSIX_MEMALIGN)
+-    if (posix_memalign(&res, alignment, size) == 0) {
+-        return res;
++#else
++    if (USE_MMAP_ALIGNED_ALLOC) {
++        GC_ASSERT(alignment % sysconf(_SC_PAGE_SIZE) == 0);
++
++        char *ptr = mmap(NULL, alignment + size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
++        if (ptr == MAP_FAILED) {
++            return NULL;
++        }
++
++        char *aligned = ptr + alignment;
++        aligned -= ((VALUE)aligned & (alignment - 1));
++        GC_ASSERT(aligned > ptr);
++        GC_ASSERT(aligned <= ptr + alignment);
++
++        size_t start_out_of_range_size = aligned - ptr;
++        GC_ASSERT(start_out_of_range_size % sysconf(_SC_PAGE_SIZE) == 0);
++        if (start_out_of_range_size > 0) {
++            if (munmap(ptr, start_out_of_range_size)) {
++                rb_bug("rb_aligned_malloc: munmap failed for start");
++            }
++        }
++
++        size_t end_out_of_range_size = alignment - start_out_of_range_size;
++        GC_ASSERT(end_out_of_range_size % sysconf(_SC_PAGE_SIZE) == 0);
++        if (end_out_of_range_size > 0) {
++            if (munmap(aligned + size, end_out_of_range_size)) {
++                rb_bug("rb_aligned_malloc: munmap failed for end");
++            }
++        }
++
++        res = (void *)aligned;
+     }
+     else {
+-        return NULL;
++# if defined(HAVE_POSIX_MEMALIGN)
++        if (posix_memalign(&res, alignment, size) != 0) {
++            return NULL;
++        }
++# elif defined(HAVE_MEMALIGN)
++        res = memalign(alignment, size);
++# else
++        char* aligned;
++        res = malloc(alignment + size + sizeof(void*));
++        aligned = (char*)res + alignment + sizeof(void*);
++        aligned -= ((VALUE)aligned & (alignment - 1));
++        ((void**)aligned)[-1] = res;
++        res = (void*)aligned;
++# endif
+     }
+-#elif defined(HAVE_MEMALIGN)
+-    res = memalign(alignment, size);
+-#else
+-    char* aligned;
+-    res = malloc(alignment + size + sizeof(void*));
+-    aligned = (char*)res + alignment + sizeof(void*);
+-    aligned -= ((VALUE)aligned & (alignment - 1));
+-    ((void**)aligned)[-1] = res;
+-    res = (void*)aligned;
+ #endif
+ 
+     /* alignment must be a power of 2 */
+@@ -10375,16 +10442,26 @@ rb_aligned_malloc(size_t alignment, size_t size)
+ }
+ 
+ static void
+-rb_aligned_free(void *ptr)
++rb_aligned_free(void *ptr, size_t size)
+ {
+ #if defined __MINGW32__
+     __mingw_aligned_free(ptr);
+ #elif defined _WIN32
+     _aligned_free(ptr);
+-#elif defined(HAVE_MEMALIGN) || defined(HAVE_POSIX_MEMALIGN)
+-    free(ptr);
+ #else
+-    free(((void**)ptr)[-1]);
++    if (USE_MMAP_ALIGNED_ALLOC) {
++        GC_ASSERT(size % sysconf(_SC_PAGE_SIZE) == 0);
++        if (munmap(ptr, size)) {
++            rb_bug("rb_aligned_free: munmap failed");
++        }
++    }
++    else {
++# if defined(HAVE_POSIX_MEMALIGN) || defined(HAVE_MEMALIGN)
++        free(ptr);
++# else
++        free(((void**)ptr)[-1]);
++# endif
++    }
+ #endif
+ }
+ 
+diff --git a/test/ruby/test_gc_compact.rb b/test/ruby/test_gc_compact.rb
+index 4a8cff33f4..f5cab55ba7 100644
+--- a/test/ruby/test_gc_compact.rb
++++ b/test/ruby/test_gc_compact.rb
+@@ -4,12 +4,32 @@
+ require 'etc'
+ 
+ class TestGCCompact < Test::Unit::TestCase
+-  class AutoCompact < Test::Unit::TestCase
++  module SupportsCompact
+     def setup
+       skip "autocompact not supported on this platform" unless supports_auto_compact?
+       super
+     end
+ 
++    private
++
++    def supports_auto_compact?
++      return true unless defined?(Etc::SC_PAGE_SIZE)
++
++      begin
++        return GC::INTERNAL_CONSTANTS[:HEAP_PAGE_SIZE] % Etc.sysconf(Etc::SC_PAGE_SIZE) == 0
++      rescue NotImplementedError
++      rescue ArgumentError
++      end
++
++      true
++    end
++  end
++
++  include SupportsCompact
++
++  class AutoCompact < Test::Unit::TestCase
++    include SupportsCompact
++
+     def test_enable_autocompact
+       before = GC.auto_compact
+       GC.auto_compact = true
+@@ -59,26 +79,17 @@ def test_implicit_compaction_does_something
+     ensure
+       GC.auto_compact = before
+     end
+-
+-    private
+-
+-    def supports_auto_compact?
+-      return true unless defined?(Etc::SC_PAGE_SIZE)
+-
+-      begin
+-        return GC::INTERNAL_CONSTANTS[:HEAP_PAGE_SIZE] % Etc.sysconf(Etc::SC_PAGE_SIZE) == 0
+-      rescue NotImplementedError
+-      rescue ArgumentError
+-      end
+-
+-      true
+-    end
+   end
+ 
+   def os_page_size
+     return true unless defined?(Etc::SC_PAGE_SIZE)
+   end
+ 
++  def setup
++    skip "autocompact not supported on this platform" unless supports_auto_compact?
++    super
++  end
++
+   def test_gc_compact_stats
+     list = []
+ 
+-- 
+2.30.1 (Apple Git-130)
+
diff --git a/ruby-3.3.0-Disable-syntax-suggest-test-case.patch b/ruby-3.3.0-Disable-syntax-suggest-test-case.patch
deleted file mode 100644
index 09d11f9..0000000
--- a/ruby-3.3.0-Disable-syntax-suggest-test-case.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9b7cb6a40d73bb86ee0de34360068e90e80f4e7e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Thu, 7 Sep 2023 13:13:02 +0200
-Subject: [PATCH] Disable syntax-suggest test case.
-
-This requires internet connection.
----
- common.mk | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/common.mk b/common.mk
-index dae7d9dc00..111e859d1b 100644
---- a/common.mk
-+++ b/common.mk
-@@ -1619,8 +1619,6 @@ no-test-bundled-gems-spec:
- 
- test-syntax-suggest:
- 
--check: $(DOT_WAIT) $(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest
--
- test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck
- no-test-bundler-precheck:
- yes-test-bundler-precheck: main $(arch)-fake.rb
diff --git a/ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch b/ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch
deleted file mode 100644
index 8238b58..0000000
--- a/ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 1cfb11bc8d01e4fc1ff47807721e29b250f0f19f Mon Sep 17 00:00:00 2001
-From: Jarek Prokop <jprokop@redhat.com>
-Date: Mon, 22 Dec 2025 10:13:34 +0100
-Subject: [PATCH] Support customizable rustc_flags for rustc builds.
-
-Add `rustc_flags` option for configure that appends to RUSTC_FLAGS
-flags used when compiling with rustc for customizable build flags.
-It appends to existing defaults in RUSTC_FLAGS.
-
-Co-authored-by: Alan Wu <XrXr@users.noreply.github.com>
----
- common.mk            | 10 ++--------
- configure.ac         |  8 ++++++++
- defs/jit.mk          |  2 ++
- template/Makefile.in |  1 +
- 4 files changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/common.mk b/common.mk
-index 08fee9119a..9ac5ae919f 100644
---- a/common.mk
-+++ b/common.mk
-@@ -270,21 +270,15 @@ MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
- # For release builds
- YJIT_RUSTC_ARGS = --crate-name=yjit \
- 	$(JIT_RUST_FLAGS) \
-+	$(RUSTC_FLAGS) \
- 	--edition=2021 \
--	-g \
--	-C lto=thin \
--	-C opt-level=3 \
--	-C overflow-checks=on \
- 	'--out-dir=$(CARGO_TARGET_DIR)/release/' \
- 	'$(top_srcdir)/yjit/src/lib.rs'
- 
- ZJIT_RUSTC_ARGS = --crate-name=zjit \
- 	$(JIT_RUST_FLAGS) \
-+	$(RUSTC_FLAGS) \
- 	--edition=2024 \
--	-g \
--	-C lto=thin \
--	-C opt-level=3 \
--	-C overflow-checks=on \
- 	'--out-dir=$(CARGO_TARGET_DIR)/release/' \
- 	'$(top_srcdir)/zjit/src/lib.rs'
- 
-diff --git a/configure.ac b/configure.ac
-index 2bbce78fd0..a3aa6dc383 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -69,6 +69,7 @@ dnl 93(bright yellow) is copied from .github/workflows/mingw.yml
- AC_ARG_VAR([cflags], [additional CFLAGS (ignored when CFLAGS is given)])dnl
- AC_ARG_VAR([cppflags], [additional CPPFLAGS (ignored when CPPFLAGS is given)])dnl
- AC_ARG_VAR([cxxflags], [additional CXXFLAGS (ignored when CXXFLAGS is given)])dnl
-+AC_ARG_VAR([rustc_flags], [additional RUSTC_FLAGS])dnl
- 
- [begin]_group "environment section" && {
- HAVE_BASERUBY=yes
-@@ -4054,6 +4055,11 @@ AS_CASE(["${ZJIT_SUPPORT}"],
-     AC_DEFINE(USE_ZJIT, 0)
- ])
- 
-+RUSTC_FLAGS='-g -C lto=thin -C opt-level=3 -C overflow-checks=on'
-+AS_IF([test -n "${rustc_flags}"], [
-+    RUSTC_FLAGS="${RUSTC_FLAGS} ${rustc_flags}"
-+])
-+
- JIT_RUST_FLAGS='--crate-type=staticlib --cfg feature=\"stats_allocator\"'
- RLIB_DIR=
- AS_CASE(["$JIT_CARGO_SUPPORT:$YJIT_SUPPORT:$ZJIT_SUPPORT"],
-@@ -4111,6 +4117,7 @@ AS_IF([test -n "$RUST_LIB"], [
- dnl These variables end up in ::RbConfig::CONFIG
- AC_SUBST(RUSTC)dnl Rust compiler command
- AC_SUBST(JIT_RUST_FLAGS)dnl the common rustc flags for JIT crates such as zjit
-+AC_SUBST(RUSTC_FLAGS)dnl user-configurable rustc compiler flags
- AC_SUBST(CARGO)dnl Cargo command for Rust builds
- AC_SUBST(CARGO_BUILD_ARGS)dnl for selecting Rust build profiles
- AC_SUBST(YJIT_SUPPORT)dnl what flavor of YJIT the Ruby build includes
-@@ -4855,6 +4862,7 @@ config_summary "strip command"       "$STRIP"
- config_summary "install doc"         "$DOCTARGETS"
- config_summary "YJIT support"        "$YJIT_SUPPORT"
- config_summary "ZJIT support"        "$ZJIT_SUPPORT"
-+config_summary "RUSTC_FLAGS"         "$RUSTC_FLAGS"
- config_summary "man page type"       "$MANTYPE"
- config_summary "search path"         "$search_path"
- config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
-diff --git a/defs/jit.mk b/defs/jit.mk
-index 42b56c4cd9..27b14e7a07 100644
---- a/defs/jit.mk
-+++ b/defs/jit.mk
-@@ -40,6 +40,7 @@ else ifneq ($(strip $(RLIB_DIR)),) # combo build
- $(RUST_LIB): $(srcdir)/ruby.rs
- 	$(ECHO) 'building $(@F)'
- 	$(gnumake_recursive)$(Q) $(RUSTC) --edition=2024 \
-+	    $(RUSTC_FLAGS) \
- 	    '-L$(@D)' \
- 	    --extern=yjit \
- 	    --extern=zjit \
-@@ -58,6 +59,7 @@ $(JIT_RLIB):
- 	$(gnumake_recursive)$(Q) $(RUSTC) --crate-name=jit \
- 	    --edition=2024 \
- 	    $(JIT_RUST_FLAGS) \
-+	    $(RUSTC_FLAGS) \
- 	    '--out-dir=$(@D)' \
- 	    '$(top_srcdir)/jit/src/lib.rs'
- endif # ifneq ($(JIT_CARGO_SUPPORT),no)
-diff --git a/template/Makefile.in b/template/Makefile.in
-index 443c394cb4..0b7b50e3aa 100644
---- a/template/Makefile.in
-+++ b/template/Makefile.in
-@@ -115,6 +115,7 @@ CARGO_TARGET_DIR=@abs_top_builddir@/target
- CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
- ZJIT_TEST_FEATURES=@ZJIT_TEST_FEATURES@
- JIT_RUST_FLAGS=@JIT_RUST_FLAGS@
-+RUSTC_FLAGS=@RUSTC_FLAGS@
- RLIB_DIR=@RLIB_DIR@
- RUST_LIB=@RUST_LIB@
- RUST_LIBOBJ = $(RUST_LIB:.a=.@OBJEXT@)
diff --git a/ruby-dwarf5-avoid_crash-r1.patch b/ruby-dwarf5-avoid_crash-r1.patch
new file mode 100644
index 0000000..b183f8f
--- /dev/null
+++ b/ruby-dwarf5-avoid_crash-r1.patch
@@ -0,0 +1,217 @@
+--- a/addr2line.c
++++ b/addr2line.c
+@@ -159,11 +159,12 @@
+     struct dwarf_section debug_info;
+     struct dwarf_section debug_line;
+     struct dwarf_section debug_ranges;
++    struct dwarf_section debug_rnglists;
+     struct dwarf_section debug_str;
+     struct obj_info *next;
+ } obj_info_t;
+ 
+-#define DWARF_SECTION_COUNT 5
++#define DWARF_SECTION_COUNT 6
+ 
+ static struct dwarf_section *
+ obj_dwarf_section_at(obj_info_t *obj, int n)
+@@ -173,6 +174,7 @@
+         &obj->debug_info,
+         &obj->debug_line,
+         &obj->debug_ranges,
++        &obj->debug_rnglists,
+         &obj->debug_str
+     };
+     if (n < 0 || DWARF_SECTION_COUNT <= n) {
+@@ -411,7 +413,7 @@
+ 	    FILL_LINE();
+ 	    break;
+ 	case DW_LNS_advance_pc:
+-	    a = uleb128((char **)&p);
++	    a = uleb128((char **)&p) * header.minimum_instruction_length;
+ 	    addr += a;
+ 	    break;
+ 	case DW_LNS_advance_line: {
+@@ -451,7 +453,7 @@
+ 	    /* isa = (unsigned int)*/(void)uleb128((char **)&p);
+ 	    break;
+ 	case 0:
+-	    a = *(unsigned char *)p++;
++	    a = uleb128((char **)&p);
+ 	    op = *p++;
+ 	    switch (op) {
+ 	    case DW_LNE_end_sequence:
+@@ -808,6 +810,18 @@
+     DW_FORM_addrx4 = 0x2c
+ };
+ 
++/* Range list entry encodings */
++enum {
++    DW_RLE_end_of_list = 0x00,
++    DW_RLE_base_addressx = 0x01,
++    DW_RLE_startx_endx = 0x02,
++    DW_RLE_startx_length = 0x03,
++    DW_RLE_offset_pair = 0x04,
++    DW_RLE_base_address = 0x05,
++    DW_RLE_start_end = 0x06,
++    DW_RLE_start_length = 0x07
++};
++
+ enum {
+     VAL_none = 0,
+     VAL_cstr = 1,
+@@ -962,6 +976,23 @@
+ }
+ 
+ static void
++di_skip_die_attributes(char **p)
++{
++    for (;;) {
++        uint64_t at = uleb128(p);
++        uint64_t form = uleb128(p);
++        if (!at && !form) break;
++        switch (form) {
++          default:
++            break;
++          case DW_FORM_implicit_const:
++            sleb128(p);
++            break;
++        }
++    }
++}
++
++static void
+ di_read_debug_abbrev_cu(DebugInfoReader *reader)
+ {
+     uint64_t prev = 0;
+@@ -975,12 +1006,7 @@
+         prev = abbrev_number;
+         uleb128(&p); /* tag */
+         p++; /* has_children */
+-        /* skip content */
+-        for (;;) {
+-            uint64_t at = uleb128(&p);
+-            uint64_t form = uleb128(&p);
+-            if (!at && !form) break;
+-        }
++        di_skip_die_attributes(&p);
+     }
+ }
+ 
+@@ -1244,12 +1270,7 @@
+     /* skip 255th record */
+     uleb128(&p); /* tag */
+     p++; /* has_children */
+-    /* skip content */
+-    for (;;) {
+-        uint64_t at = uleb128(&p);
+-        uint64_t form = uleb128(&p);
+-        if (!at && !form) break;
+-    }
++    di_skip_die_attributes(&p);
+     for (uint64_t n = uleb128(&p); abbrev_number != n; n = uleb128(&p)) {
+         if (n == 0) {
+             fprintf(stderr,"%d: Abbrev Number %"PRId64" not found\n",__LINE__, abbrev_number);
+@@ -1257,12 +1278,7 @@
+         }
+         uleb128(&p); /* tag */
+         p++; /* has_children */
+-        /* skip content */
+-        for (;;) {
+-            uint64_t at = uleb128(&p);
+-            uint64_t form = uleb128(&p);
+-            if (!at && !form) break;
+-        }
++        di_skip_die_attributes(&p);
+     }
+     return p;
+ }
+@@ -1390,6 +1406,21 @@
+     }
+ }
+ 
++static uint64_t
++read_dw_form_addr(DebugInfoReader *reader, char **ptr)
++{
++    char *p = *ptr;
++    *ptr = p + reader->format;
++    if (reader->format == 4) {
++        return read_uint32(&p);
++    } else if (reader->format == 8) {
++        return read_uint64(&p);
++    } else {
++        fprintf(stderr,"unknown address_size:%d", reader->address_size);
++        abort();
++    }
++}
++
+ static uintptr_t
+ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr)
+ {
+@@ -1403,8 +1434,50 @@
+     }
+     else if (ptr->ranges_set) {
+         /* TODO: support base address selection entry */
+-        char *p = reader->obj->debug_ranges.ptr + ptr->ranges;
++        char *p;
+         uint64_t base = ptr->low_pc_set ? ptr->low_pc : reader->current_low_pc;
++        if (reader->obj->debug_rnglists.ptr) {
++            p = reader->obj->debug_rnglists.ptr + ptr->ranges;
++            for (;;) {
++                uint8_t rle = read_uint8(&p);
++                uintptr_t base_address = 0;
++                uintptr_t from, to;
++                if (rle == DW_RLE_end_of_list) break;
++                switch (rle) {
++                  case DW_RLE_base_addressx:
++                    uleb128(&p);
++                    break;
++                  case DW_RLE_startx_endx:
++                    uleb128(&p);
++                    uleb128(&p);
++                    break;
++                  case DW_RLE_startx_length:
++                    uleb128(&p);
++                    uleb128(&p);
++                    break;
++                  case DW_RLE_offset_pair:
++                    from = base_address + uleb128(&p);
++                    to = base_address + uleb128(&p);
++                    if (base + from <= addr && addr < base + to) {
++                        return from;
++                    }
++                    break;
++                  case DW_RLE_base_address:
++                    base_address = read_dw_form_addr(reader, &p);
++                    break;
++                  case DW_RLE_start_end:
++                    read_dw_form_addr(reader, &p);
++                    read_dw_form_addr(reader, &p);
++                    break;
++                  case DW_RLE_start_length:
++                    read_dw_form_addr(reader, &p);
++                    uleb128(&p);
++                    break;
++                }
++            }
++            return false;
++        }
++        p = reader->obj->debug_ranges.ptr + ptr->ranges;
+         for (;;) {
+             uintptr_t from = read_uintptr(&p);
+             uintptr_t to = read_uintptr(&p);
+@@ -1750,6 +1823,7 @@
+                     ".debug_info",
+                     ".debug_line",
+                     ".debug_ranges",
++                    ".debug_rnglists",
+                     ".debug_str"
+                 };
+ 
+@@ -2006,6 +2080,7 @@
+                     "__debug_info",
+                     "__debug_line",
+                     "__debug_ranges",
++                    "__debug_rnglists",
+                     "__debug_str"
+                 };
+                 struct LP(segment_command) *scmd = (struct LP(segment_command) *)lcmd;
diff --git a/ruby.rpmlintrc b/ruby.rpmlintrc
index ec8ac11..bc72c06 100644
--- a/ruby.rpmlintrc
+++ b/ruby.rpmlintrc
@@ -13,47 +13,44 @@ addFilter(r'ruby\.(spec|src):\d+: W: unversioned-explicit-provides bundled\(ccan
 # The template files do not have to have executable bits.
 addFilter(r'^rubygem-bundler\.noarch: E: non-executable-script /usr/share/gems/gems/bundler-[\d\.]+/lib/bundler/templates/[\w/\.]+ 644 /usr/bin/env ')
 
-# Samples don't really need executable bits.
-addFilter(r'^rubygem-bigdecimal\.x86_64: E: non-executable-script /usr/share/gems/gems/bigdecimal-[\d\.]+/sample/\w+.rb 644 /usr/local/bin/ruby$')
-
 # The bundled gem files permissions are overridden as 644 by `make install`.
 # https://bugs.ruby-lang.org/issues/17840
-# https://github.com/rubygems/rubygems/issues/5255
-addFilter(r'^.*: E: non-executable-script /usr/share/gems/gems/(abbrev|getoptlong|nkf|observer|resolv|resolv-replace|rinda|syslog)-[\d\.]+/bin/\w+ 644 ')
+# power_assert
+# https://github.com/ruby/power_assert/issues/35
+addFilter(r'^rubygem-power_assert\.noarch: E: non-executable-script /usr/share/gems/gems/power_assert-[\d\.]+/bin/console 644 ')
+addFilter(r'^rubygem-power_assert\.noarch: E: non-executable-script /usr/share/gems/gems/power_assert-[\d\.]+/bin/setup 644 ')
+# rake
+# https://github.com/ruby/rake/issues/385
+addFilter(r'^rubygem-rake\.noarch: E: non-executable-script /usr/share/gems/gems/rake-[\d\.]+/bin/bundle 644 ')
+addFilter(r'^rubygem-rake\.noarch: E: non-executable-script /usr/share/gems/gems/rake-[\d\.]+/bin/console 644 ')
+addFilter(r'^rubygem-rake\.noarch: E: non-executable-script /usr/share/gems/gems/rake-[\d\.]+/bin/rake 644 ')
+addFilter(r'^rubygem-rake\.noarch: E: non-executable-script /usr/share/gems/gems/rake-[\d\.]+/bin/rdoc 644 ')
+addFilter(r'^rubygem-rake\.noarch: E: non-executable-script /usr/share/gems/gems/rake-[\d\.]+/bin/rubocop 644 ')
+addFilter(r'^rubygem-rake\.noarch: E: non-executable-script /usr/share/gems/gems/rake-[\d\.]+/bin/setup 644 ')
+# rbs
+# https://github.com/ruby/rbs/issues/673
+addFilter(r'^rubygem-rbs\.noarch: E: non-executable-script /usr/share/gems/gems/rbs-[\d\.]+/bin/annotate-with-rdoc 644 ')
+addFilter(r'^rubygem-rbs\.noarch: E: non-executable-script /usr/share/gems/gems/rbs-[\d\.]+/bin/console 644 ')
+addFilter(r'^rubygem-rbs\.noarch: E: non-executable-script /usr/share/gems/gems/rbs-[\d\.]+/bin/query-rdoc 644 ')
+addFilter(r'^rubygem-rbs\.noarch: E: non-executable-script /usr/share/gems/gems/rbs-[\d\.]+/bin/rbs-prof 644 ')
+addFilter(r'^rubygem-rbs\.noarch: E: non-executable-script /usr/share/gems/gems/rbs-[\d\.]+/bin/setup 644 ')
+addFilter(r'^rubygem-rbs\.noarch: E: non-executable-script /usr/share/gems/gems/rbs-[\d\.]+/bin/sort 644 ')
+addFilter(r'^rubygem-rbs\.noarch: E: non-executable-script /usr/share/gems/gems/rbs-[\d\.]+/bin/steep 644 ')
+addFilter(r'^rubygem-rbs\.noarch: E: non-executable-script /usr/share/gems/gems/rbs-[\d\.]+/bin/test_runner.rb 644 ')
+# test-unit
+addFilter(r'^rubygem-test-unit\.noarch: E: non-executable-script /usr/share/gems/gems/test-unit-[\d\.]+/test/run-test.rb 644 ')
 
-# Ruby provides API to set the cipher list.
-addFilter(r'^ruby-libs\.\w+: W: crypto-policy-non-compliance-openssl /usr/lib(64)?/ruby/openssl.so SSL_CTX_set_cipher_list$')
+# The function `chroot` without using `chdir` is detected by rpmlint with the
+# following message. However it looks a false positive as the `chroot` in the
+# `dir.c` is just used as a Ruby binding `Dir.chroot` for the function.
+#
+# ruby-libs.x86_64: E: missing-call-to-chdir-with-chroot /usr/lib64/libruby.so.3.0.1
+# This executable appears to call chroot without using chdir to change the
+# current directory. This is likely an error and permits an attacker to break
+# out of the chroot by using fchdir. While that's not always a security issue,
+# this has to be checked.
+addFilter(r'^ruby-libs\.\w+: E: missing-call-to-chdir-with-chroot /usr/lib(64)?/libruby.so.[\d/.]+$')
 
-# `gethostbyname` is part of deprecated Ruby API. There is also request to drop the API altogether:
-# https://bugs.ruby-lang.org/issues/13097
-# https://bugs.ruby-lang.org/issues/17944
-addFilter(r'^ruby-libs\.\w+: W: binary-or-shlib-calls-gethostbyname /usr/lib(64)?/ruby/socket.so$')
-
-# Rake ships some examples.
-addFilter(r'^rubygem-rake.noarch: W: devel-file-in-non-devel-package /usr/share/gems/gems/rake-[\d\.]+/doc/example/\w+.c$')
-
-# Some executables don't have their manual pages. Is it worth of use help2man?
-addFilter(r'^.+: W: no-manual-page-for-binary (bundler|gem|racc|rbs|rdbg|rdoc|ruby-mri|syntax_suggest|typeprof)$')
-
-# Default gems does not come with any documentation.
-addFilter(r'^rubygem-(bigdecimal|io-console|json|psych)\.\w+: W: no-documentation$')
-
-# rubygems-devel ships only RPM macros and generators. Their placement is given
-# by RPM and can't be modified.
-addFilter(r'rubygems-devel.noarch: W: only-non-binary-in-usr-lib$')
-
-# Ignore some spelling false positives.
-# Ignore spelling of technical terms
-addFilter(r'^ruby-default-gems.noarch: E: spelling-error \(\'gemspec\'')
-addFilter(r'^ruby-libs.x86_64: E: spelling-error \(\'libruby\'')
-addFilter(r'^rubygem-test-unit.noarch: E: spelling-error \(\'xUnit\'')
-addFilter(r'^rubygem-psych.x86_64: E: spelling-error \(\'libyaml\'')
-addFilter(r'^rubygem-io-console.x86_64: E: spelling-error \(\'readline\'')
-# `pyaml` is part of URL
-addFilter(r'^rubygem-psych.x86_64: E: spelling-error \(\'pyyaml\'')
-# `de-` is actually prefix
-addFilter(r'^rubygem-psych.x86_64: E: spelling-error \(\'de\'')
-
-# It does not seemt to be worth of changing rubygems to archful package due to
-# single directory, unless it causes some real troubles.
-addFilter(r'^rubygems.noarch: E: noarch-with-lib64$')
+# Nothing referred and no dependency information should be no problem.
+# https://bugs.ruby-lang.org/issues/16558#note-2
+addFilter(r'^ruby-libs\.\w+: E: shared-lib-without-dependency-information /usr/lib(64)?/ruby/enc/gb2312.so$')
diff --git a/ruby.spec b/ruby.spec
index a364fe6..93b559d 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,155 +1,68 @@
-%global major_version 4
+%global major_version 3
 %global minor_version 0
-%global teeny_version 1
+%global teeny_version 4
 %global major_minor_version %{major_version}.%{minor_version}
 
 %global ruby_version %{major_minor_version}.%{teeny_version}
 %global ruby_release %{ruby_version}
 
 # Specify the named version. It has precedense to revision.
-%dnl %global milestone preview2
+#%%global milestone rc1
 
 # Keep the revision enabled for pre-releases from GIT.
-%dnl %global revision d428d086c2
+#%%global revision 684649ea05
 
 %global ruby_archive %{name}-%{ruby_version}
 
 # If revision and milestone are removed/commented out, the official release build is expected.
-%if 0%{?milestone:1} != 0
-%global ruby_archive %{ruby_archive}-%{?milestone}
-%endif
-
-%if 0%{?revision:1} != 0
-%global ruby_archive %{ruby_archive}-%{?revision}
-%define ruby_archive_timestamp %(stat --printf='@%Y' %{_sourcedir}/%{ruby_archive}.tar.xz | date -f - +"%Y%m%d")
-%endif
-
 %if 0%{?milestone:1}%{?revision:1} != 0
-%define development_release ~%{?ruby_archive_timestamp}%{?milestone}%{?!milestone:%{?revision:git%{revision}}}
+%global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision}}
+%define ruby_archive_timestamp %(stat --printf='@%Y' %{_sourcedir}/%{ruby_archive}.tar.xz | date -f - +"%Y%m%d")
+%define development_release %{?milestone}%{?!milestone:%{?revision:%{ruby_archive_timestamp}git%{revision}}}
 %endif
 
 
+%global release 153
+%{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
+
 # The RubyGems library has to stay out of Ruby directory tree, since the
 # RubyGems should be share by all Ruby implementations.
 %global rubygems_dir %{_datadir}/rubygems
 
-## BUNDLED_GEMS_VERSIONS
-
 # Bundled libraries versions
-%global rubygems_version 4.0.3
-%global rubygems_molinillo_version 0.8.0
-%global rubygems_net_http_version 0.7.0
-%global rubygems_net_protocol_version 0.2.2
-%global rubygems_optparse_version 0.8.0
-%global rubygems_resolv_version 0.6.2
-%global rubygems_securerandom_version 0.4.1
-%global rubygems_timeout_version 0.4.4
-%global rubygems_tsort_version 0.2.0
-%global rubygems_uri_version 1.1.1
+%global rubygems_version 3.2.33
+%global rubygems_molinillo_version 0.7.0
 
 # Default gems.
-%global bundler_version 4.0.3
-%global bundler_connection_pool_version 2.5.4
-%global bundler_fileutils_version 1.8.0
-%global bundler_net_http_persistent_version 4.0.6
-%global bundler_pub_grub_version 0.5.0
-%global bundler_securerandom_version 0.4.1
-%global bundler_thor_version 1.4.0
-%global bundler_tsort_version 0.2.0
-%global bundler_uri_version 1.1.1
+%global bundler_version 2.2.33
+%global bundler_connection_pool_version 2.3.0
+%global bundler_fileutils_version 1.4.1
+%global bundler_molinillo_version 0.7.0
+%global bundler_net_http_persistent_version 4.0.0
+%global bundler_thor_version 1.1.0
+%global bundler_tmpdir_version 0.1.0
+%global bundler_uri_version 0.10.0
 
-%global date_version 3.5.1
-%global delegate_version 0.6.1
-%global did_you_mean_version 2.0.0
-%global digest_version 3.2.1
-%global english_version 0.8.1
-%global erb_version 6.0.1
-%global error_highlight_version 0.7.1
-%global etc_version 1.4.6
-%global fcntl_version 1.3.0
-%global fileutils_version 1.8.0
-%global find_version 0.2.0
-%global forwardable_version 1.4.0
-%global io_console_version 0.8.2
-%global io_nonblock_version 0.3.2
-%global io_wait_version 0.4.0
-%global ipaddr_version 1.2.8
-%global json_version 2.18.0
-%global net_http_version 0.9.1
-%global net_protocol_version 0.2.2
-%global open_uri_version 0.5.0
-%global open3_version 0.2.1
-%global openssl_version 4.0.0
-%global optparse_version 0.8.1
-%global pp_version 0.6.3
-%global prettyprint_version 0.2.0
-%global prism_version 1.8.0
-%global psych_version 5.3.1
-%global resolv_version 0.7.0
-%global ruby2_keywords_version 0.0.5
-%global securerandom_version 0.4.1
-%global shellwords_version 0.2.2
-%global singleton_version 0.3.0
-%global stringio_version 3.2.0
-%global strscan_version 3.1.6
-%global syntax_suggest_version 2.0.2
-%global tempfile_version 0.3.1
-%global time_version 0.4.2
-%global timeout_version 0.6.0
-%global tmpdir_version 0.3.1
-%global tsort_version 0.2.0
-%global un_version 0.3.0
-%global uri_version 1.1.1
-%global weakref_version 0.1.4
-%global win32_registry_version 0.1.2
-%global yaml_version 0.4.0
-%global zlib_version 3.2.2
+%global bigdecimal_version 3.0.0
+%global did_you_mean_version 1.5.0
+%global erb_version 2.2.0
+%global io_console_version 0.5.7
+%global irb_version 1.3.5
+%global json_version 2.5.1
+%global openssl_version 2.2.1
+%global psych_version 3.3.2
+%global racc_version 1.5.2
+%global rdoc_version 6.3.3
 
 # Bundled gems.
-%global abbrev_version 0.1.2
-%global base64_version 0.3.0
-%global benchmark_version 0.5.0
-%global bigdecimal_version 4.0.1
-%global csv_version 3.3.5
-%global debug_version 1.11.1
-%global drb_version 2.2.3
-%global fiddle_version 1.1.8
-%global getoptlong_version 0.2.1
-%global irb_version 1.16.0
-%global logger_version 1.7.0
-%global matrix_version 0.4.3
-%global minitest_version 6.0.0
-%global mutex_m_version 0.3.0
-%global net_ftp_version 0.3.9
-%global net_imap_version 0.6.2
-%global net_pop_version 0.1.2
-%global net_smtp_version 0.5.1
-%global nkf_version 0.2.0
-%global observer_version 0.1.2
-%global ostruct_version 0.6.3
-%global power_assert_version 3.0.1
-%global prime_version 0.1.4
-%global pstore_version 0.2.0
-%global racc_version 1.8.1
-%global rake_version 13.3.1
-%global rbs_version 3.10.0
-%global rdoc_version 7.0.3
-%global readline_version 0.0.4
-%global reline_version 0.6.3
-%global repl_type_completor_version 0.1.12
-%global resolv_replace_version 0.1.1
-%global rexml_version 3.4.4
-%global rinda_version 0.2.0
-%global rss_version 0.3.2
-%global syslog_version 0.3.0
-%global test_unit_version 3.7.5
-%global typeprof_version 0.31.1
-%global win32ole_version 1.9.2
-
-## END_BUNDLED_GEMS_VERSIONS
-
-# Bundled nkf version
-%global bundled_nkf_version 2.1.5
+%global minitest_version 5.14.2
+%global power_assert_version 1.2.0
+%global rake_version 13.0.3
+%global rbs_version 1.4.0
+%global test_unit_version 3.3.7
+%global rexml_version 3.2.5
+%global rss_version 0.2.9
+%global typeprof_version 0.15.2
 
 %global tapset_libdir %(echo %{_libdir} | sed 's/64//')*
 
@@ -162,68 +75,24 @@
 %bcond_without gmp
 %bcond_without hostname
 %bcond_without systemtap
-%bcond_without rust
-
-# Don't build rust parts if we are not building with rust bits.
-%if 0%{?with_rust}
-# YJIT and ZJIT is supported on x86_64 and aarch64.
-# https://github.com/ruby/ruby/blob/master/doc/jit/yjit.md
-# https://github.com/ruby/ruby/blob/master/doc/jit/zjit.md
-%ifarch x86_64 aarch64
-%bcond_without yjit
-%bcond_without zjit
-%endif
-%endif
-
-# Enable test when building on local.
-%bcond_with bundler_tests
-%bcond_without parallel_tests
 
 %if 0%{?fedora}
 %bcond_without hardening_test
 %endif
 
-# The additional linker flags break binary rubygem- packages.
-# https://bugzilla.redhat.com/show_bug.cgi?id=2043092
-%undefine _package_note_flags
+# LTO appears to cause some issue to SEGV handler.
+# https://bugs.ruby-lang.org/issues/17052
+%define _lto_cflags %{nil}
 
 Summary: An interpreter of object-oriented scripting language
 Name: ruby
-Version: %{ruby_version}%{?development_release}
-Release: 31%{?dist}
-# Licenses, which are likely not included in binary RPMs:
-# Apache-2.0:
-#   benchmark/gc/redblack.rb
-#     But this file might be BSD-2-Clause licensed after all:
-#     https://bugs.ruby-lang.org/issues/20420
-# GPL-1.0-or-later: ext/win32/lib/win32/sspi.rb
-# GPL-1.0-or-later OR Artistic-1.0-Perl: win32/win32.c, include/ruby/win32.h,
-#   ext/win32ole/win32ole.c
-# IETF (this is not official SPDX identifier)
-#   .bundle/gems/net-imap-0.4.9/LICENSE.txt
-#     Licenses in this file covers fair use and don't need to be listed:
-#     https://gitlab.com/fedora/legal/fedora-license-data/-/issues/506
-#
-# BSD-3-Clause: missing/{crypt,mt19937,setproctitle}.c, addr2line.c:2652
-# CC0: ccan/{build_assert/build_assert.h,check_type/check_type.h,
-#   container_of/container_of.h,str/str.h}
-#   Allowed based on 'grandfather clause':
-#   https://gitlab.com/fedora/legal/fedora-license-data/-/blob/7d9720b2cfd8ccb98d1975312942d99588a0da7c/data/CC0-1.0.toml#L11-14
-#   https://gitlab.com/fedora/legal/fedora-license-data/-/issues/499
-# dtoa: missing/dtoa.c
-# GPL-3.0-or-later WITH Bison-exception-2.2: parse.{c,h}, ext/ripper/ripper.c
-# HPND-Markus-Kuhn: missing/langinfo.c
-# ISC: missing/strl{cat,cpy}.c
-# LicenseRef-Fedora-Public-Domain: include/ruby/st.h, strftime.c, missing/*, ...
-#   https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/145
-# MIT: ccan/list/list.h
-# Ruby OR BSD-2-Clause OR GPL-1.0-or-later: lib/net/protocol.rb
-# Ruby-pty: ext/pty/pty.c
-# Unicode-DFS-2015: some of enc/trans/**/*.src
-#   There is also license review ticket here:
-#   https://gitlab.com/fedora/legal/fedora-license-data/-/issues/500
+Version: %{ruby_version}
+Release: %{release_string}
+# Public Domain for example for: include/ruby/st.h, strftime.c, missing/*, ...
+# MIT and CCO: ccan/*
 # zlib: ext/digest/md5/md5.*, ext/nkf/nkf-utf8/nkf.c
-License: (Ruby OR BSD-2-Clause) AND (Ruby OR BSD-2-Clause OR GPL-1.0-or-later) AND BSD-3-Clause AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND ISC AND LicenseRef-Fedora-Public-Domain AND MIT AND CC0-1.0 AND zlib AND Unicode-DFS-2015 AND HPND-Markus-Kuhn AND Ruby-pty
+# UCD: some of enc/trans/**/*.src
+License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
 URL: https://www.ruby-lang.org/
 Source0: https://cache.ruby-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.xz
 Source1: operating_system.rb
@@ -233,53 +102,37 @@ Source3: ruby-exercise.stp
 Source4: macros.ruby
 Source5: macros.rubygems
 # RPM dependency generators.
-Source6: rubygems.attr
-Source7: rubygems.req
-Source8: rubygems.prov
-Source9: rubygems.con
+Source8: rubygems.attr
+Source9: rubygems.req
+Source10: rubygems.prov
+Source11: rubygems.con
 # ABRT hoook test case.
-Source10: test_abrt.rb
+Source13: test_abrt.rb
 # SystemTap tests.
-Source11: test_systemtap.rb
-# Ruby OpenSSL FIPS tests.
-Source12: test_openssl_fips.rb
-# RPM gem Requires dependency generator tests.
-Source13: rpm_test_helper.rb
-Source14: test_rubygems_req.rb
-Source15: test_rubygems_prov.rb
-Source16: test_rubygems_con.rb
+Source14: test_systemtap.rb
 
 # The load directive is supported since RPM 4.12, i.e. F21+. The build process
 # fails on older Fedoras.
-%{load:%{SOURCE4}}
-%{load:%{SOURCE5}}
-
-%define _local_file_attrs local_generator
-%define __local_generator_requires make -C %{_builddir}/%{buildsubdir}/%{_vpath_builddir} -s runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE7}"
-%define __local_generator_provides make -C %{_builddir}/%{buildsubdir}/%{_vpath_builddir} -s runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE8}"
-%define __local_generator_conflicts make -C %{_builddir}/%{buildsubdir}/%{_vpath_builddir} -s runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE9}"
-%define __local_generator_path ^%{gem_dir}/specifications/.*\.gemspec$
+%{?load:%{SOURCE4}}
+%{?load:%{SOURCE5}}
 
 # Fix ruby_version abuse.
 # https://bugs.ruby-lang.org/issues/11002
 Patch0: ruby-2.3.0-ruby_version.patch
-# Fix ruby_version abuse for rdoc.
-# Since rdoc is bundled gem, the patch is split from ruby-2.3.0-ruby_version.patch
-# re-made in ruby/rdoc git source and will be applied in correct path in the
-# specfile where we have the exact rdoc version that is part of the path.
-Patch1: ruby-2.3.0-ruby_version-Add-ruby_version_dir_name-support-for-RDoc.patch
 # http://bugs.ruby-lang.org/issues/7807
-Patch2: ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+Patch1: ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
 # Allows to override libruby.so placement. Hopefully we will be able to return
 # to plain --with-rubyarchprefix.
 # http://bugs.ruby-lang.org/issues/8973
-Patch3: ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+Patch2: ruby-2.1.0-Enable-configuration-of-archlibdir.patch
 # Force multiarch directories for i.86 to be always named i386. This solves
 # some differencies in build between Fedora and RHEL.
-Patch4: ruby-2.1.0-always-use-i386.patch
+Patch3: ruby-2.1.0-always-use-i386.patch
 # Allows to install RubyGems into custom directory, outside of Ruby's tree.
 # http://bugs.ruby-lang.org/issues/5617
-Patch5: ruby-2.1.0-custom-rubygems-location.patch
+Patch4: ruby-2.1.0-custom-rubygems-location.patch
+# Make mkmf verbose by default
+Patch5: ruby-1.9.3-mkmf-verbose.patch
 # The ABRT hook used to be initialized by preludes via following patches:
 # https://bugs.ruby-lang.org/issues/8566
 # https://bugs.ruby-lang.org/issues/15306
@@ -289,68 +142,52 @@ Patch5: ruby-2.1.0-custom-rubygems-location.patch
 # https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/
 # For now, load the ABRT hook via this simple patch:
 Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch
-# Disable syntax_suggest test suite, which tries to download its dependencies.
-# https://bugs.ruby-lang.org/issues/19297
-Patch7: ruby-3.3.0-Disable-syntax-suggest-test-case.patch
-# Add a way to provide %%build_rustflags to JIT's rustc.
-# https://github.com/ruby/ruby/pull/15695
-Patch8: ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch
-# https://github.com/ruby/rdoc/pull/1531
-# Fix error with `gem install --document=rdoc,ri`
-Patch9: rdoc-pr1531-fix-mutilple-document-installation.patch
+# Workaround "an invalid stdio handle" error on PPC, due to recently introduced
+# hardening features of glibc (rhbz#1361037).
+# https://bugs.ruby-lang.org/issues/12666
+Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
+# Fix DWARF5 support.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1920533
+# https://bugs.ruby-lang.org/issues/17585
+Patch15: ruby-dwarf5-avoid_crash-r1.patch
+# Avoid possible timeout errors in TestBugReporter#test_bug_reporter_add.
+# https://bugs.ruby-lang.org/issues/16492
+Patch19: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
+# Fix /test_\(ast_compacts\|compact_count\|complex_hash_keys\|gc_compact_stats\)/
+# test failures on ppc64le.
+# https://bugs.ruby-lang.org/issues/18746
+# https://bugs.ruby-lang.org/issues/18394
+Patch20: ruby-3.1.0-Use-mmap-for-allocating-heap-pages-in-the-GC.patch
+# Fix loading of default gems.
+# https://bugzilla.redhat.com/show_bug.cgi?id=2027099
+# https://github.com/rubygems/rubygems/pull/5154
+Patch22: rubygems-3.2.33-Fix-loading-operating_system-rb-customizations-too-late.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?with_rubypick:Suggests: rubypick}
+Suggests: rubypick
 Recommends: ruby(rubygems) >= %{rubygems_version}
-Recommends: ruby-default-gems >= %{version}-%{release}
-Recommends: ruby-bundled-gems >= %{version}-%{release}
 Recommends: rubygem(bigdecimal) >= %{bigdecimal_version}
 
-# Build dependencies
 BuildRequires: autoconf
-BuildRequires: gcc
-BuildRequires: make
-BuildRequires: libffi-devel
-BuildRequires: libxcrypt-devel
-BuildRequires: libyaml-devel
-BuildRequires: openssl-devel
-BuildRequires: zlib-devel
+BuildRequires: gdbm-devel
 %{?with_gmp:BuildRequires: gmp-devel}
-%{?with_systemtap:BuildRequires: %{_bindir}/dtrace}
-%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
-%if 0%{?with_rust}
-BuildRequires: %{_bindir}/rustc
-
-# We need the %%{build_rustflags}, EL needs different package than Fedora.
-%if 0%{?fedora}
-BuildRequires: rust-srpm-macros
-%else
-Buildrequires: rust-toolset
-%endif
-
-%endif
-
-# Install section
-BuildRequires: multilib-rpm-config
-
-# Check dependencies
-
-# Required to test hardening.
-%{?with_hardening_test:BuildRequires: %{_bindir}/checksec}
-
+BuildRequires: libffi-devel
+BuildRequires: openssl-devel
+BuildRequires: libyaml-devel
+BuildRequires: readline-devel
 # Needed to pass test_set_program_name(TestRubyOptions)
 BuildRequires: procps
-# Neede by `Socket.gethostname returns the host name ERROR`
-%{?with_hostname:BuildRequires: %{_bindir}/hostname}
-
+%{?with_systemtap:BuildRequires: %{_bindir}/dtrace}
 # RubyGems test suite optional dependencies.
 %{?with_git:BuildRequires: git}
-# `cmake` is required for test/rubygems/test_gem_ext_cmake_builder.rb.
 %{?with_cmake:BuildRequires: %{_bindir}/cmake}
-
-# The bundler/spec/runtime/setup_spec.rb requires the command `man`.
-%{?with_bundler_tests:BuildRequires: %{_bindir}/man}
-
+# Required to test hardening.
+%{?with_hardening_test:BuildRequires: %{_bindir}/checksec}
+%{?with_hostname:BuildRequires: %{_bindir}/hostname}
+BuildRequires: multilib-rpm-config
+BuildRequires: gcc
+BuildRequires: make
+BuildRequires: zlib-devel
 
 # This package provides %%{_bindir}/ruby-mri therefore it is marked by this
 # virtual provide. It can be installed as dependency of rubypick.
@@ -379,6 +216,7 @@ Ruby or an application embedding Ruby.
 
 %package libs
 Summary:    Libraries necessary to run Ruby
+License:    Ruby or BSD
 Provides:   ruby(release) = %{ruby_release}
 
 # Virtual provides for CCAN copylibs.
@@ -391,6 +229,16 @@ Provides: bundled(ccan-list)
 # StdLib default gems.
 Provides: bundled(rubygem-did_you_mean) = %{did_you_mean_version}
 Provides: bundled(rubygem-openssl) = %{openssl_version}
+Provides: bundled(rubygem-racc) = %{racc_version}
+
+# Tcl/Tk support was removed from stdlib in Ruby 2.4, i.e. F27 timeframe.
+Obsoletes: ruby-tcltk < 2.4.0
+
+# The Net::Telnet and XMLRPC were removed in Ruby 2.8, i.e. F34 timeframe.
+# https://bugs.ruby-lang.org/issues/16484
+# TODO: Update the versions prior landing in Fedora.
+Obsoletes: rubygem-net-telnet < 0.2.0-%{release}
+Obsoletes: rubygem-xmlrpc < 0.3.0-%{release}
 
 
 %description libs
@@ -401,35 +249,16 @@ This package includes the libruby, necessary to run Ruby.
 %package -n rubygems
 Summary:    The Ruby standard for packaging ruby libraries
 Version:    %{rubygems_version}
-# BSD-2-Clause OR Ruby:
-#   lib/rubygems/net-http/
-#   lib/rubygems/net-protocol/
-#   lib/rubygems/optparse/
-#   lib/rubygems/resolv/
-#   lib/rubygems/timeout/
-#   lib/rubygems/tsort/
-# MIT: lib/rubygems/resolver/molinillo
-# Ruby OR BSD-2-Clause OR GPL-1.0-or-later: lib/net/protocol.rb
-License:    (Ruby OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Ruby) AND (Ruby OR BSD-2-Clause OR GPL-1.0-or-later) AND MIT
+License:    Ruby or MIT
 Requires:   ruby(release)
 Recommends: rubygem(bundler) >= %{bundler_version}
 Recommends: rubygem(rdoc) >= %{rdoc_version}
-Recommends: rubygem(io-console)
-Requires:   rubygem(psych) >= %{psych_version}%{?psych_prerelease:~%{sub %{psych_prerelease} 2 -1}}
+Recommends: rubygem(io-console) >= %{io_console_version}
+Requires:   rubygem(psych) >= %{psych_version}
 Provides:   gem = %{version}-%{release}
 Provides:   ruby(rubygems) = %{version}-%{release}
-Provides:   bundled(rubygems) = %{rubygems_version}
 # https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910
 Provides:   bundled(rubygem-molinillo) = %{rubygems_molinillo_version}
-Provides:   bundled(rubygem-net-http) = %{rubygems_net_http_version}
-Provides:   bundled(rubygem-net-protocol) = %{rubygems_net_protocol_version}
-Provides:   bundled(rubygem-optparse) = %{rubygems_optparse_version}
-Provides:   bundled(rubygem-resolv) = %{rubygems_resolv_version}
-Provides:   bundled(rubygem-securerandom) = %{rubygems_securerandom_version}
-Provides:   bundled(rubygem-timeout) = %{rubygems_timeout_version}
-Provides:   bundled(rubygem-tsort) = %{rubygems_tsort_version}
-Provides:   bundled(rubygem-uri) = %{rubygems_uri_version}
-
 BuildArch:  noarch
 
 %description -n rubygems
@@ -440,7 +269,7 @@ libraries.
 %package -n rubygems-devel
 Summary:    Macros and development tools for packaging RubyGems
 Version:    %{rubygems_version}
-License:    MIT
+License:    Ruby or MIT
 Requires:   ruby(rubygems) >= %{version}-%{release}
 # Needed for RDoc documentation format generation.
 Requires:   rubygem(json) >= %{json_version}
@@ -458,9 +287,16 @@ Macros and development tools for packaging RubyGems.
 
 %package default-gems
 Summary:    Default gems which are part of Ruby StdLib
+Requires:   ruby(rubygems) >= %{rubygems_version}
 Supplements: ruby(rubygems)
+# Include the io-console dependency for reline.
+Requires:   rubygem(io-console)
+# Obsoleted by Ruby 2.7 in F32 timeframe.
+Obsoletes: rubygem-did_you_mean < 1.4.0-130
+Obsoletes: rubygem-racc < 1.4.16-130
 # Obsoleted by Ruby 3.0 in F34 timeframe.
 Obsoletes: rubygem-openssl < 2.2.0-145
+Provides: rubygem(openssl) = %{openssl_version}-%{release}
 BuildArch:  noarch
 
 %description default-gems
@@ -471,9 +307,17 @@ StdLib.
 %package -n rubygem-irb
 Summary:    The Interactive Ruby
 Version:    %{irb_version}
-License:    Ruby OR BSD-2-Clause
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+# ruby-default-gems is required to run irb.
+# https://bugs.ruby-lang.org/issues/16951
+Requires:   ruby-default-gems >= %{ruby_version}
 Provides:   irb = %{version}-%{release}
-Provides:   bundled(rubygem-irb) = %{irb_version}
+Provides:   rubygem(irb) = %{version}-%{release}
+# Obsoleted by Ruby 2.6 in F30 timeframe.
+Provides:   ruby(irb) = %{ruby_version}-%{release}
+Provides:   ruby-irb = %{ruby_version}-%{release}
+Obsoletes:  ruby-irb < %{ruby_version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-irb
@@ -484,21 +328,15 @@ from the terminal.
 %package -n rubygem-rdoc
 Summary:    A tool to generate HTML and command-line documentation for Ruby projects
 Version:    %{rdoc_version}
-# BSD-3-Clause: lib/rdoc/generator/darkfish.rb
-# CC-BY-2.5: lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif
-# OFL-1.1-RFN: lib/rdoc/generator/template/darkfish/css/fonts.css
-# MIT: lib/rdoc/generator/aliki.rb
-# MIT: lib/rdoc/generator/template/aliki/*
-# Note that RDoc now embeds Racc parser:
-# https://github.com/ruby/rdoc/pull/1019
-# Luckily, this should have no license impact:
-# https://github.com/ruby/racc/blob/5eb07b28bfb3e193a1cac07798fe7be7e1e246c4/lib/racc/parser.rb#L8-L10
-License:    GPL-2.0-only AND Ruby AND BSD-3-Clause AND CC-BY-2.5 AND OFL-1.1-RFN AND MIT
-Requires:   rubygem(io-console)
+# SIL: lib/rdoc/generator/template/darkfish/css/fonts.css
+License:    GPLv2 and Ruby and MIT and OFL
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Requires:   rubygem(io-console) >= %{io_console_version}
 Requires:   rubygem(json) >= %{json_version}
 Provides:   rdoc = %{version}-%{release}
 Provides:   ri = %{version}-%{release}
-Provides:   bundled(rubygem-rdoc) = %{rdoc_version}
+Provides:   rubygem(rdoc) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-rdoc
@@ -519,9 +357,10 @@ This package contains documentation for %{name}.
 %package -n rubygem-bigdecimal
 Summary:    BigDecimal provides arbitrary-precision floating point decimal arithmetic
 Version:    %{bigdecimal_version}
-# dtoa: missing/dtoa.c
-License:    (Ruby OR BSD-2-Clause) AND dtoa
-Provides:   bundled(rubygem-bigdecimal) = %{bigdecimal_version}
+License:    Ruby or BSD
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(bigdecimal) = %{version}-%{release}
 
 %description -n rubygem-bigdecimal
 Ruby provides built-in support for arbitrary precision integer arithmetic.
@@ -539,8 +378,9 @@ conversion between base 10 and base 2.
 %package -n rubygem-io-console
 Summary:    IO/Console is a simple console utilizing library
 Version:    %{io_console_version}
-License:    Ruby OR BSD-2-Clause
-Provides:   bundled(rubygem-io-console) = %{io_console_version}
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(io-console) = %{version}-%{release}
 
 %description -n rubygem-io-console
 IO/Console provides very simple and portable access to console. It doesn't
@@ -550,18 +390,11 @@ provide higher layer features, such like curses and readline.
 %package -n rubygem-json
 Summary:    This is a JSON implementation as a Ruby extension in C
 Version:    %{json_version}
-# Apache-2.0 OR BSL-1.0: ext/json/vendor/ryu.h
-# MIT: ext/json/vendor/jeaiii-ltoa.h
-# BSL-1.0: ext/json/vendor/fpconv.c
-License:    (Ruby OR BSD-2-Clause) AND (Apache-2.0 OR BSL-1.0) AND MIT AND BSL-1.0
-Provides:   bundled(rubygem-json) = %{json_version}
-# https://github.com/ulfjack/ryu
-Provides:   bundled(ryu)
-# jeaiii-ltoa.h
-# https://github.com/jeaiii/itoa
-Provides:   bundled(itoa)
-# https://github.com/night-shift/fpconv
-Provides:   bundled(fpconv)
+# UCD: ext/json/generator/generator.c
+License:    (Ruby or GPLv2) and UCD
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(json) = %{version}-%{release}
 
 %description -n rubygem-json
 This is a implementation of the JSON specification according to RFC 4627.
@@ -572,9 +405,11 @@ markup language.
 
 %package -n rubygem-psych
 Summary:    A libyaml wrapper for Ruby
-Version:    %{psych_version}%{?psych_prerelease:~%{sub %{psych_prerelease} 2 -1}}
+Version:    %{psych_version}
 License:    MIT
-Provides:   bundled(rubygem-psych) = %{psych_version}%{?psych_prerelease:~%{sub %{psych_prerelease} 2 -1}}
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(psych) = %{version}-%{release}
 
 %description -n rubygem-psych
 Psych is a YAML parser and emitter. Psych leverages
@@ -586,27 +421,18 @@ serialize and de-serialize most Ruby objects to and from the YAML format.
 %package -n rubygem-bundler
 Summary:    Library and utilities to manage a Ruby application's gem dependencies
 Version:    %{bundler_version}
-# BSD-2-Clause OR Ruby:
-#   lib/bundler/vendor/fileutils
-#   lib/bundler/vendor/tsort
-#   lib/bundler/vendor/uri
-# MIT:
-#   lib/bundler/vendor/connection_pool
-#   lib/bundler/vendor/net-http-persistent
-#   lib/bundler/vendor/pub_brub
-#   lib/bundler/vendor/thor
-#   lib/rubygems/resolver/molinillo
-License:    MIT AND (Ruby OR BSD-2-Clause)
+License:    MIT
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
 Requires:   rubygem(io-console)
-Provides:   bundled(rubygem-bundler) = %{bundler_version}
+Provides:   rubygem(bundler) = %{version}-%{release}
 # https://github.com/bundler/bundler/issues/3647
 Provides:   bundled(rubygem-connection_pool) = %{bundler_connection_pool_version}
 Provides:   bundled(rubygem-fileutils) = %{bundler_fileutils_version}
-Provides:   bundled(rubygem-net-http-persistent) = %{bundler_net_http_persistent_version}
-Provides:   bundled(rubygem-pub_grub) = %{bundler_pub_grub_version}
-Provides:   bundled(rubygem-securerandom) = %{bundler_securerandom_version}
+Provides:   bundled(rubygem-molinillo) = %{bundler_molinillo_version}
+Provides:   bundled(rubygem-net-http-persisntent) = %{bundler_net_http_persistent_version}
 Provides:   bundled(rubygem-thor) = %{bundler_thor_version}
-Provides:   bundled(rubygem-tsort) = %{bundler_tsort_version}
+Provides:   bundled(rubygem-tmpdir) = %{bundler_tmpdir_version}
 Provides:   bundled(rubygem-uri) = %{bundler_uri_version}
 BuildArch:  noarch
 
@@ -620,60 +446,26 @@ many machines, systematically and repeatably.
 # These are regular packages, which might be installed just optionally. Users
 # should list them among their dependencies (in Gemfile).
 
-%package bundled-gems
-Summary:    Bundled gems which are part of Ruby StdLib
-Provides:   bundled(rubygem-abbrev) = %{abbrev_version}
-Provides:   bundled(rubygem-base64) = %{base64_version}
-Provides:   bundled(rubygem-benchmark) = %{benchmark_version}
-Provides:   bundled(rubygem-csv) = %{csv_version}
-Provides:   bundled(rubygem-debug) = %{debug_version}
-Provides:   bundled(rubygem-drb) = %{drb_version}
-Provides:   bundled(rubygem-getoptlong) = %{getoptlong_version}
-Provides:   bundled(rubygem-fiddle) = %{fiddle_version}
-Provides:   bundled(rubygem-logger) = %{logger_version}
-Provides:   bundled(rubygem-matrix) = %{matrix_version}
-Provides:   bundled(rubygem-mutex_m) = %{mutex_m_version}
-Provides:   bundled(rubygem-net-ftp) = %{net_ftp_version}
-Provides:   bundled(rubygem-net-imap) = %{net_imap_version}
-Provides:   bundled(rubygem-net-pop) = %{net_pop_version}
-Provides:   bundled(rubygem-net-smtp) = %{net_smtp_version}
-Provides:   bundled(rubygem-nkf) = %{nkf_version}
-Provides:   bundled(rubygem-observer) = %{observer_version}
-Provides:   bundled(rubygem-ostruct) = %{ostruct_version}
-Provides:   bundled(rubygem-prime) = %{prime_version}
-Provides:   bundled(rubygem-pstore) = %{pstore_version}
-Provides:   bundled(rubygem-readline) = %{readline_version}
-Provides:   bundled(rubygem-reline) = %{reline_version}
-Provides:   bundled(rubygem-repl_type_completor) = %{repl_type_completor_version}
-Provides:   bundled(rubygem-resolv-replace) = %{resolv_replace_version}
-Provides:   bundled(rubygem-rinda) = %{rinda_version}
-Provides:   bundled(rubygem-syslog) = %{syslog_version}
-# https://github.com/nurse/nkf
-# Please note that nkf going to be promoted to bundled gem in Ruby 3.4:
-# https://github.com/ruby/ruby/commit/2e3a7f70ae71650be6ea38a483f66ce17ca5eb1d
-Provides:   bundled(nkf) = %{bundled_nkf_version}
-
-
-%description bundled-gems
-Bundled gems which are part of Ruby StdLib. While being part of Ruby, these
-needs to be listed in Gemfile to be used by Bundler.
-
-
 %package -n rubygem-minitest
 Summary:    Minitest provides a complete suite of testing facilities
 Version:    %{minitest_version}
 License:    MIT
-Provides:   bundled(rubygem-minitest) = %{minitest_version}
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(minitest) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-minitest
-minitest/test is a small and incredibly fast unit testing framework.
+minitest/unit is a small and incredibly fast unit testing framework.
 
 minitest/spec is a functionally complete spec engine.
 
 minitest/benchmark is an awesome way to assert the performance of your
 algorithms in a repeatable manner.
 
+minitest/mock by Steven Baker, is a beautifully tiny mock object
+framework.
+
 minitest/pride shows pride in testing and adds coloring to your test
 output.
 
@@ -681,8 +473,10 @@ output.
 %package -n rubygem-power_assert
 Summary:    Power Assert for Ruby
 Version:    %{power_assert_version}
-License:    Ruby OR BSD-2-Clause
-Provides:   bundled(rubygem-power_assert) = %{power_assert_version}
+License:    Ruby or BSD
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(power_assert) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-power_assert
@@ -695,8 +489,10 @@ condition is not satisfied.
 Summary:    Ruby based make-like utility
 Version:    %{rake_version}
 License:    MIT
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
 Provides:   rake = %{version}-%{release}
-Provides:   bundled(rubygem-rake) = %{rake_version}
+Provides:   rubygem(rake) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-rake
@@ -707,8 +503,11 @@ specified in standard Ruby syntax.
 %package -n rubygem-rbs
 Summary:    Type signature for Ruby
 Version:    %{rbs_version}
-License:    Ruby OR BSD-2-Clause
-Provides:   bundled(rubygem-rbs) = %{rbs_version}
+License:    Ruby or BSD
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(rbs) = %{version}-%{release}
+BuildArch:  noarch
 
 %description -n rubygem-rbs
 RBS is the language for type signatures for Ruby and standard library
@@ -719,8 +518,12 @@ definitions.
 Summary:    An xUnit family unit testing framework for Ruby
 Version:    %{test_unit_version}
 # lib/test/unit/diff.rb is a double license of the Ruby license and PSF license.
-License:    (Ruby OR BSD-2-Clause) AND (Ruby OR BSD-2-Clause OR Python-2.0.1)
-Provides:   bundled(rubygem-test-unit) = %{test_unit_version}
+# lib/test-unit.rb is a dual license of the Ruby license and LGPLv2.1 or later.
+License:    (Ruby or BSD) and (Ruby or BSD or Python) and (Ruby or BSD or LGPLv2+)
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Requires:   rubygem(power_assert)
+Provides:   rubygem(test-unit) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-test-unit
@@ -730,24 +533,14 @@ programming software development methodology, for Smalltalk's SUnit. It allows
 writing tests, checking results and automated testing in Ruby.
 
 
-%package -n rubygem-racc
-Version:    %{racc_version}
-Summary:    Racc is a LALR(1) parser generator
-License:    Ruby OR BSD-2-Clause
-URL:        https://github.com/ruby/racc
-Provides:   bundled(rubygem-racc) = %{racc_version}
-
-%description -n rubygem-racc
-Racc is a LALR(1) parser generator.
-It is written in Ruby itself, and generates Ruby program.
-
-
 %package -n rubygem-rexml
 Summary:    An XML toolkit for Ruby
 Version:    %{rexml_version}
-License:    BSD-2-Clause
+License:    BSD
 URL:        https://github.com/ruby/rexml
-Provides:   bundled(rubygem-rexml) = %{rexml_version}
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(rexml) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-rexml
@@ -765,9 +558,11 @@ features such as XPath.
 %package -n rubygem-rss
 Summary:    Family of libraries that support various formats of XML "feeds"
 Version:    %{rss_version}
-License:    BSD-2-Clause
+License:    BSD
 URL:        https://github.com/ruby/rss
-Provides:   bundled(rubygem-rss) = %{rss_version}
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Provides:   rubygem(rss) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-rss
@@ -782,7 +577,10 @@ Summary:    TypeProf is a type analysis tool for Ruby code based on abstract int
 Version:    %{typeprof_version}
 License:    MIT
 URL:        https://github.com/ruby/typeprof
-Provides:   bundled(rubygem-typeprof) = %{typeprof_version}
+Requires:   ruby(release)
+Requires:   ruby(rubygems) >= %{rubygems_version}
+Requires:   rubygem(rbs) >= %{rbs_version}
+Provides:   rubygem(typeprof) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-typeprof
@@ -796,20 +594,22 @@ analysis result in RBS format, a standard type description format for Ruby
 %prep
 %setup -q -n %{ruby_archive}
 
-%patch 0 -p1
+# Remove bundled libraries to be sure they are not used.
+rm -rf ext/psych/yaml
+rm -rf ext/fiddle/libffi*
 
-pushd .bundle/gems/rdoc-%{rdoc_version}
-%patch 1 -p1
-%patch 9 -p1
-popd
-
-%patch 2 -p1
-%patch 3 -p1
-%patch 4 -p1
-%patch 5 -p1
-%patch 6 -p1
-%patch 7 -p1
-%patch 8 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch9 -p1
+%patch15 -p1
+%patch19 -p1
+%patch20 -p1
+%patch22 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -817,11 +617,6 @@ cp -a %{SOURCE3} .
 %build
 autoconf
 
-%global _configure %{_builddir}/%{buildsubdir}/configure
-
-mkdir -p %{_vpath_builddir}
-pushd %{_vpath_builddir}
-
 %configure \
         --with-rubylibprefix='%{ruby_libdir}' \
         --with-archlibdir='%{_libdir}' \
@@ -838,40 +633,26 @@ pushd %{_vpath_builddir}
         --with-ruby-pc='%{name}.pc' \
         --with-compress-debug-sections=no \
         --disable-rpath \
-        --enable-mkmf-verbose \
         --enable-shared \
         --with-ruby-version='' \
         --enable-multiarch \
-        %{?with_yjit: --enable-yjit} \
-        %{?with_zjit: --enable-zjit} \
-        %{?with_rust: rustc_flags='%{build_rustflags}'} \
 
-popd
-
-# V=1 in %%make_build outputs the compiler options more verbosely.
-# https://bugs.ruby-lang.org/issues/18756
-%make_build COPY="cp -p" -C %{_vpath_builddir}
+# Q= makes the build output more verbose and allows to check Fedora
+# compiler options.
+%make_build COPY="cp -p" Q=
 
 %install
 rm -rf %{buildroot}
-
-%make_install -C %{_vpath_builddir}
+%make_install
 
 # TODO: Regenerate RBS parser in lib/rbs/parser.rb
 
 # Rename ruby/config.h to ruby/config-<arch>.h to avoid file conflicts on
 # multilib systems and install config.h wrapper
 %multilib_fix_c_header --file %{_includedir}/%{name}/config.h
-
-# `ruby` executable is placed in some strange directory for some unknow
-# reasons.
-# https://bugs.ruby-lang.org/issues/20800
-# https://github.com/ruby/ruby/pull/12043
-CONFIG_TARGET_DIR=%{buildroot}%{_exec_prefix}/$( \
-  %{_vpath_builddir}/miniruby -I%{_vpath_builddir} -rrbconfig -e 'puts RbConfig::CONFIG["config_target"]'
-)
-mv ${CONFIG_TARGET_DIR}/bin/ruby %{buildroot}%{_bindir}
-rm -rd ${CONFIG_TARGET_DIR}
+# TODO: The correct patch should be %%{_includedir}/%%{name}/rb_mjit_min_header-%%{ruby_version}.h
+# https://bugs.ruby-lang.org/issues/15425
+%multilib_fix_c_header --file %{_includedir}/rb_mjit_min_header-%{ruby_version}.h
 
 # Rename the ruby executable. It is replaced by RubyPick.
 %{?with_rubypick:mv %{buildroot}%{_bindir}/%{name}{,-mri}}
@@ -882,7 +663,8 @@ sed -i 's/Version: \${ruby_version}/Version: %{ruby_version}/' %{buildroot}%{_li
 
 # Kill bundled certificates, as they should be part of ca-certificates.
 for cert in \
-  rubygems.org/GlobalSign.pem
+  rubygems.org/GlobalSignRootCA.pem \
+  rubygems.org/GlobalSignRootCA_R3.pem
 do
   rm %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert
   rm -d $(dirname %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert) || :
@@ -892,18 +674,18 @@ test ! "$(ls -A %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/ 2>/dev/null)"
 
 # Move macros file into proper place and replace the %%{name} macro, since it
 # would be wrongly evaluated during build of other packages.
-mkdir -p %{buildroot}%{_rpmmacrodir}
-install -m 644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/macros.ruby
-sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/macros.ruby
-install -m 644 %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.rubygems
-sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/macros.rubygems
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
+install -m 644 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/macros.d/macros.ruby
+sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.ruby
+install -m 644 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/macros.d/macros.rubygems
+sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.rubygems
 
 # Install dependency generators.
-mkdir -p %{buildroot}%{_fileattrsdir}
-install -m 644 %{SOURCE6} %{buildroot}%{_fileattrsdir}
-install -m 755 %{SOURCE7} %{buildroot}%{_rpmconfigdir}
-install -m 755 %{SOURCE8} %{buildroot}%{_rpmconfigdir}
+mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs
+install -m 644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/fileattrs
 install -m 755 %{SOURCE9} %{buildroot}%{_rpmconfigdir}
+install -m 755 %{SOURCE10} %{buildroot}%{_rpmconfigdir}
+install -m 755 %{SOURCE11} %{buildroot}%{_rpmconfigdir}
 
 # Install custom operating_system.rb.
 mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
@@ -919,62 +701,80 @@ mv %{buildroot}%{ruby_libdir}/gems %{buildroot}%{gem_dir}
 mkdir -p %{buildroot}%{_exec_prefix}/lib{,64}/gems/%{name}
 
 # Move bundled rubygems to %%gem_dir and %%gem_extdir_mri
-# make symlinks for io-console, which is considered to be part of stdlib by other Gems
+# make symlinks for io-console and bigdecimal, which are considered to be part of stdlib by other Gems
+mkdir -p %{buildroot}%{gem_dir}/gems/irb-%{irb_version}/lib
+mv %{buildroot}%{ruby_libdir}/irb* %{buildroot}%{gem_dir}/gems/irb-%{irb_version}/lib
+mv %{buildroot}%{gem_dir}/specifications/default/irb-%{irb_version}.gemspec %{buildroot}%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/irb-%{irb_version}/lib/irb.rb %{buildroot}%{ruby_libdir}/irb.rb
+# TODO: This should be possible to replaced by simple directory symlink
+# after ~ F31 EOL (rhbz#1691039).
+mkdir -p %{buildroot}%{ruby_libdir}/irb
+pushd %{buildroot}%{gem_dir}/gems/irb-%{irb_version}/lib
+find irb -type d -mindepth 1 -exec mkdir %{buildroot}%{ruby_libdir}/'{}' \;
+find irb -type f -exec ln -s %{gem_dir}/gems/irb-%{irb_version}/lib/'{}' %{buildroot}%{ruby_libdir}/'{}' \;
+popd
+
+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}/gems/bigdecimal-%{bigdecimal_version}/lib
+mkdir -p %{buildroot}%{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}/bigdecimal
+mv %{buildroot}%{ruby_libdir}/bigdecimal %{buildroot}%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/bigdecimal.so %{buildroot}%{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}
+touch %{buildroot}%{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}/gem.build_complete
+mv %{buildroot}%{gem_dir}/specifications/default/bigdecimal-%{bigdecimal_version}.gemspec %{buildroot}%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib/bigdecimal %{buildroot}%{ruby_libdir}/bigdecimal
+ln -s %{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}/bigdecimal.so %{buildroot}%{ruby_libarchdir}/bigdecimal.so
+
 # TODO: Put help files into proper location.
 # https://bugs.ruby-lang.org/issues/15359
-mkdir -p %{buildroot}%{gem_libdir bundler}
-mv %{buildroot}%{ruby_libdir}/bundler.rb %{buildroot}%{gem_libdir bundler}
-mv %{buildroot}%{ruby_libdir}/bundler %{buildroot}%{gem_libdir bundler}
-mv %{buildroot}%{gem_spec -d bundler} %{buildroot}%{gem_spec bundler}
+mkdir -p %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib
+mv %{buildroot}%{ruby_libdir}/bundler.rb %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib
+mv %{buildroot}%{ruby_libdir}/bundler %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib
+mv %{buildroot}%{gem_dir}/specifications/default/bundler-%{bundler_version}.gemspec %{buildroot}%{gem_dir}/specifications
 
-mkdir -p %{buildroot}%{gem_libdir io-console}
-mkdir -p %{buildroot}%{gem_extdir_mri io-console}/io
-mv %{buildroot}%{ruby_libdir}/io %{buildroot}%{gem_libdir io-console}
-mv %{buildroot}%{ruby_libarchdir}/io/console.so %{buildroot}%{gem_extdir_mri io-console}/io
-touch %{buildroot}%{gem_extdir_mri io-console}/gem.build_complete
-mv %{buildroot}%{gem_spec -d io-console} %{buildroot}%{gem_spec io-console}
-ln -s %{gem_libdir io-console}/io %{buildroot}%{ruby_libdir}/io
-ln -s %{gem_extdir_mri io-console}/io/console.so %{buildroot}%{ruby_libarchdir}/io/console.so
+mkdir -p %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
+mkdir -p %{buildroot}%{_libdir}/gems/%{name}/io-console-%{io_console_version}/io
+mv %{buildroot}%{ruby_libdir}/io %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/io/console.so %{buildroot}%{_libdir}/gems/%{name}/io-console-%{io_console_version}/io
+touch %{buildroot}%{_libdir}/gems/%{name}/io-console-%{io_console_version}/gem.build_complete
+mv %{buildroot}%{gem_dir}/specifications/default/io-console-%{io_console_version}.gemspec %{buildroot}%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/io-console-%{io_console_version}/lib/io %{buildroot}%{ruby_libdir}/io
+ln -s %{_libdir}/gems/%{name}/io-console-%{io_console_version}/io/console.so %{buildroot}%{ruby_libarchdir}/io/console.so
 
-mkdir -p %{buildroot}%{gem_libdir json}
-mkdir -p %{buildroot}%{gem_extdir_mri json}
-mv %{buildroot}%{ruby_libdir}/json* %{buildroot}%{gem_libdir json}
-mv %{buildroot}%{ruby_libarchdir}/json/ %{buildroot}%{gem_extdir_mri json}
-touch %{buildroot}%{gem_extdir_mri json}/gem.build_complete
-mv %{buildroot}%{gem_spec -d json} %{buildroot}%{gem_spec json}
-ln -s %{gem_libdir json}/json.rb %{buildroot}%{ruby_libdir}/json.rb
-ln -s %{gem_libdir json}/json %{buildroot}%{ruby_libdir}/json
-ln -s %{gem_extdir_mri json}/json/ %{buildroot}%{ruby_libarchdir}/json
+mkdir -p %{buildroot}%{gem_dir}/gems/json-%{json_version}/lib
+mkdir -p %{buildroot}%{_libdir}/gems/%{name}/json-%{json_version}
+mv %{buildroot}%{ruby_libdir}/json* %{buildroot}%{gem_dir}/gems/json-%{json_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/json/ %{buildroot}%{_libdir}/gems/%{name}/json-%{json_version}/
+touch %{buildroot}%{_libdir}/gems/%{name}/json-%{json_version}/gem.build_complete
+mv %{buildroot}%{gem_dir}/specifications/default/json-%{json_version}.gemspec %{buildroot}%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/json-%{json_version}/lib/json.rb %{buildroot}%{ruby_libdir}/json.rb
+ln -s %{gem_dir}/gems/json-%{json_version}/lib/json %{buildroot}%{ruby_libdir}/json
+ln -s %{_libdir}/gems/%{name}/json-%{json_version}/json/ %{buildroot}%{ruby_libarchdir}/json
 
-mkdir -p %{buildroot}%{gem_libdir psych}
-mkdir -p %{buildroot}%{gem_extdir_mri psych}
-mv %{buildroot}%{ruby_libdir}/psych* %{buildroot}%{gem_libdir psych}
-mv %{buildroot}%{ruby_libarchdir}/psych.so %{buildroot}%{gem_extdir_mri psych}
-touch %{buildroot}%{gem_extdir_mri psych}/gem.build_complete
-mv %{buildroot}%{gem_spec -d psych} %{buildroot}%{gem_spec psych}
-ln -s %{gem_libdir psych}/psych %{buildroot}%{ruby_libdir}/psych
-ln -s %{gem_libdir psych}/psych.rb %{buildroot}%{ruby_libdir}/psych.rb
-ln -s %{gem_extdir_mri psych}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so
+mkdir -p %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib
+mkdir -p %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version}
+mv %{buildroot}%{ruby_libdir}/psych* %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/psych.so %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version}/
+touch %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version}/gem.build_complete
+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_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb
+ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so
 
 # Move the binary extensions into proper place (if no gem has binary extension,
 # the extensions directory might be empty).
-# TODO: Get information about extension form .gemspec files.
-find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{major_minor_version}.*/* -maxdepth 0 \
+find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{ruby_version}/* -maxdepth 0 \
   -exec mv '{}' %{buildroot}%{_libdir}/gems/%{name}/ \; \
   || echo "No gem binary extensions to move."
 
-# Remove the extension sources and library copies from `lib` dir.
-find %{buildroot}%{gem_dir}/gems/*/ext -maxdepth 0 -exec rm -rf '{}' +
-find %{buildroot}%{gem_dir}/gems/*/lib -name \*.so -delete
-
 # Move man pages into proper location
 mkdir -p %{buildroot}%{_mandir}/man{1,5}
-mv %{buildroot}%{gem_instdir irb}/man/irb.1 %{buildroot}%{_mandir}/man1
-mv %{buildroot}%{gem_instdir rake}/doc/rake.1 %{buildroot}%{_mandir}/man1
-mv %{buildroot}%{gem_instdir rdoc}/man/ri.1 %{buildroot}%{_mandir}/man1
+mv %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/doc/rake.1 %{buildroot}%{_mandir}/man1
 # https://bugs.ruby-lang.org/issues/17778
-cp -a %{buildroot}%{gem_libdir bundler}/bundler/man/*.1 %{buildroot}%{_mandir}/man1
-cp -a %{buildroot}%{gem_libdir bundler}/bundler/man/*.5 %{buildroot}%{_mandir}/man5
+cp -a %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib/bundler/man/*.1 %{buildroot}%{_mandir}/man1
+cp -a %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib/bundler/man/*.5 %{buildroot}%{_mandir}/man5
 
 %if %{with systemtap}
 # Install a tapset and fix up the path to the library.
@@ -991,231 +791,96 @@ echo 'doc/images' >> .ruby-doc.en
 echo 'doc/syntax' >> .ruby-doc.en
 
 find doc -maxdepth 1 -type f -name '*.ja*' > .ruby-doc.ja
+echo 'doc/irb' >> .ruby-doc.ja
 echo 'doc/pty' >> .ruby-doc.ja
 
 sed -i 's/^/%doc /' .ruby-doc.*
 sed -i 's/^/%lang(ja) /' .ruby-doc.ja
 
+# Remove useless .github directory from Rake.
+# https://github.com/ruby/rake/pull/333
+rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github
+
 %check
 %if 0%{?with_hardening_test}
 # Check Ruby hardening.
-%define fortification_x86_64  fortified="10" fortify-able="26"
-%define fortification_i686    fortified="10" fortify-able="26"
-%define fortification_aarch64 fortified="11" fortify-able="28"
-%define fortification_ppc64le fortified="7" fortify-able="24"
-%define fortification_s390x   fortified="10" fortify-able="24"
-%define fortification_riscv64 fortified="10" fortify-able="26"
-# https://unix.stackexchange.com/questions/366/convince-grep-to-output-all-lines-not-just-those-with-matches
-checksec --format=xml --file=%{_vpath_builddir}/libruby.so.%{ruby_version} | \
-  sed -r "s/<file (.*)\/>/\1/" | \
-  sed -nr $'/relro="full" canary="yes" nx="yes" pie="dso" rpath="no" runpath="no" symbols="yes" fortify_source="partial" %{expand:%{fortification_%{_target_cpu}}} filename='\''redhat-linux-build\/libruby.so.%{ruby_version}'\''/h; ${p;x;/./Q0;Q1}'
+checksec --file=libruby.so.%{ruby_version} | \
+  grep "Full RELRO.*Canary found.*NX enabled.*DSO.*No RPATH.*No RUNPATH.*Yes.*\d*.*\d*.*libruby.so.%{ruby_version}"
 %endif
 
 # Check RubyGems version.
-[ "`make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT='%{_builddir}/%{buildsubdir}/bin/gem -v' | tail -1`" == '%{rubygems_version}' ]
+[ "`make runruby TESTRUN_SCRIPT='bin/gem -v' | tail -1`" == '%{rubygems_version}' ]
 
 # Check Rubygems bundled dependencies versions.
 
 # Molinillo.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
   module Gem; module Resolver; end; end; \
-  require 'rubygems/vendor/molinillo/lib/molinillo/gem_metadata'; \
-  puts '%%{rubygems_molinillo_version}: %{rubygems_molinillo_version}'; \
-  puts %Q[Gem::Molinillo::VERSION: #{Gem::Molinillo::VERSION}]; \
-  exit 1 if Gem::Molinillo::VERSION != '%{rubygems_molinillo_version}'; \
-\""
-
-# Net::HTTP.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; module Net; end; end; \
-  require 'rbconfig'; \
-  require 'rubygems/vendor/net-http/lib/net/http'; \
-  puts '%%{rubygems_net_http_version}: %{rubygems_net_http_version}'; \
-  puts %Q[Gem::Net::HTTP::VERSION: #{Gem::Net::HTTP::VERSION}]; \
-  exit 1 if Gem::Net::HTTP::VERSION != '%{rubygems_net_http_version}'; \
-\""
-
-# Net::Protocol.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; module Net; end; end; \
-  require 'rubygems/vendor/net-protocol/lib/net/protocol'; \
-  puts '%%{rubygems_net_protocol_version}: %{rubygems_net_protocol_version}'; \
-  puts %Q[Gem::Net::Protocol::VERSION: #{Gem::Net::Protocol::VERSION}]; \
-  exit 1 if Gem::Net::Protocol::VERSION != '%{rubygems_net_protocol_version}'; \
-\""
-
-# OptParse.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; end; \
-  require 'rubygems/vendor/optparse/lib/optparse'; \
-  puts '%%{rubygems_optparse_version}: %{rubygems_optparse_version}'; \
-  puts %Q[Gem::OptionParser::Version: #{Gem::OptionParser::Version}]; \
-  exit 1 if Gem::OptionParser::Version != '%{rubygems_optparse_version}'; \
-\""
-
-# Resolv.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; end; \
-  require 'rbconfig'; \
-  require 'rubygems/vendor/resolv/lib/resolv'; \
-  puts '%%{rubygems_resolv_version}: %{rubygems_resolv_version}'; \
-  puts %Q[Gem::Resolv::VERSION: #{Gem::Resolv::VERSION}]; \
-  exit 1 if Gem::Resolv::VERSION != '%{rubygems_resolv_version}'; \
-\""
-
-# SecureRandom.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; module Random; end; end; \
-  require 'rubygems/vendor/securerandom/lib/securerandom'; \
-  puts '%%{rubygems_securerandom_version}: %{rubygems_securerandom_version}'; \
-  puts %Q[Gem::SecureRandom::VERSION: #{Gem::SecureRandom::VERSION}]; \
-  exit 1 if Gem::SecureRandom::VERSION != '%{rubygems_securerandom_version}'; \
-\""
-
-# Timeout.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; end; \
-  require 'rubygems/vendor/timeout/lib/timeout'; \
-  puts '%%{rubygems_timeout_version}: %{rubygems_timeout_version}'; \
-  puts %Q[Gem::Timeout::VERSION: #{Gem::Timeout::VERSION}]; \
-  exit 1 if Gem::Timeout::VERSION != '%{rubygems_timeout_version}'; \
-\""
-
-# TSort
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; end; \
-  require 'rubygems/vendor/tsort/lib/tsort'; \
-  puts '%%{rubygems_tsort_version}: %{rubygems_tsort_version}'; \
-  puts %Q[Gem::TSort::VERSION: #{Gem::TSort::VERSION}]; \
-  exit 1 if Gem::TSort::VERSION != '%{rubygems_tsort_version}'; \
-\""
-
-# URI.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; end; \
-  require 'rubygems/vendor/uri/lib/uri/version'; \
-  puts '%%{rubygems_uri_version}: %{rubygems_uri_version}'; \
-  puts %Q[Gem::URI::VERSION: #{Gem::URI::VERSION}]; \
-  exit 1 if Gem::URI::VERSION != '%{rubygems_uri_version}'; \
-\""
+  require 'rubygems/resolver/molinillo/lib/molinillo/gem_metadata'; \
+  puts Gem::Resolver::Molinillo::VERSION\\\"\" | tail -1`" \
+  == '%{rubygems_molinillo_version}' ]
 
 # Check Bundler bundled dependencies versions.
 
 # connection_pool.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
   module Bundler; end; \
   require 'bundler/vendor/connection_pool/lib/connection_pool/version'; \
-  puts '%%{bundler_connection_pool_version}; %{bundler_connection_pool_version}'; \
-  puts %Q[Bundler::ConnectionPool::VERSION: #{Bundler::ConnectionPool::VERSION}]; \
-  exit 1 if Bundler::ConnectionPool::VERSION != '%{bundler_connection_pool_version}'; \
-\""
+  puts Bundler::ConnectionPool::VERSION\\\"\" | tail -1`" \
+  == '%{bundler_connection_pool_version}' ]
 
 # FileUtils.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
   module Bundler; end; \
   require 'bundler/vendor/fileutils/lib/fileutils'; \
-  puts '%%{bundler_fileutils_version}: %{bundler_fileutils_version}'; \
-  puts %Q[Bundler::FileUtils::VERSION: #{Bundler::FileUtils::VERSION}]; \
-  exit 1 if Bundler::FileUtils::VERSION != '%{bundler_fileutils_version}'; \
-\""
+  puts Bundler::FileUtils::VERSION\\\"\" | tail -1`" \
+  == '%{bundler_fileutils_version}' ]
 
-# PubGrub
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
+# Molinillo.
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
   module Bundler; end; \
-  require 'bundler/vendor/pub_grub/lib/pub_grub/version'; \
-  puts '%%{bundler_pub_grub_version}: %{bundler_pub_grub_version}'; \
-  puts %Q[Bundler::PubGrub::VERSION: #{Bundler::PubGrub::VERSION}]; \
-  exit 1 if Bundler::PubGrub::VERSION != '%{bundler_pub_grub_version}'; \
-\""
+  require 'bundler/vendor/molinillo/lib/molinillo/gem_metadata'; \
+  puts Bundler::Molinillo::VERSION\\\"\" | tail -1`" \
+  == '%{bundler_molinillo_version}' ]
 
 # Net::HTTP::Persistent.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Gem; end; \
-  module Bundler; end; \
-  require 'rbconfig'; \
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
+  module Bundler; module Persistent; module Net; module HTTP; \
+  end; end; end; end; \
   require 'bundler/vendor/net-http-persistent/lib/net/http/persistent'; \
-  puts '%%{bundler_net_http_persistent_version}: %{bundler_net_http_persistent_version}'; \
-  puts %Q[Gem::Net::HTTP::Persistent::VERSION: #{Gem::Net::HTTP::Persistent::VERSION}]; \
-  exit 1 if Gem::Net::HTTP::Persistent::VERSION != '%{bundler_net_http_persistent_version}'; \
-\""
-
-# SecureRandom.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Bundler; module Random; end; end; \
-  require 'bundler/vendor/securerandom/lib/securerandom'; \
-  puts '%%{bundler_securerandom_version}: %{bundler_securerandom_version}'; \
-  puts %Q[Bundler::SecureRandom::VERSION: #{Bundler::SecureRandom::VERSION}]; \
-  exit 1 if Bundler::SecureRandom::VERSION != '%{bundler_securerandom_version}'; \
-\""
+  puts Bundler::Persistent::Net::HTTP::Persistent::VERSION\\\"\" | tail -1`" \
+  == '%{bundler_net_http_persistent_version}' ]
 
 # Thor.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
   module Bundler; end; \
   require 'bundler/vendor/thor/lib/thor/version'; \
-  puts '%%{bundler_thor_version}: %{bundler_thor_version}'; \
-  puts %Q[Bundler::Thor::VERSION: #{Bundler::Thor::VERSION}]; \
-  exit 1 if Bundler::Thor::VERSION != '%{bundler_thor_version}'; \
-\""
+  puts Bundler::Thor::VERSION\\\"\" | tail -1`" \
+  == '%{bundler_thor_version}' ]
 
-# TSort
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  module Bundler; end; \
-  require 'bundler/vendor/tsort/lib/tsort'; \
-  puts '%%{bundler_tsort_version}: %{bundler_tsort_version}'; \
-  puts %Q[Bundler::TSort::VERSION: #{Bundler::TSort::VERSION}]; \
-  exit 1 if Bundler::TSort::VERSION != '%{bundler_tsort_version}'; \
-\""
+# tmpdir.
+# TODO: There is no version in bundled tmpdir yet.
+#%%{global bundler_tmpdir_version}
 
 # URI.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
   module Bundler; end; \
   require 'bundler/vendor/uri/lib/uri/version'; \
-  puts '%%{bundler_uri_version}: %{bundler_uri_version}'; \
-  puts %Q[Bundler::URI::VERSION: #{Bundler::URI::VERSION}]; \
-  exit 1 if Bundler::URI::VERSION != '%{bundler_uri_version}'; \
-\""
-
-# Check bundled libraries versions.
-
-# Nkf.
-make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
-  require 'rubygems'; \
-  require 'nkf'; \
-  puts '%%{bundled_nkf_version}: %{bundled_nkf_version}'; \
-  puts %Q[NKF::NKF_VERSION: #{NKF::NKF_VERSION}]; \
-  exit 1 if NKF::NKF_VERSION != '%{bundled_nkf_version}'; \
-\""
+  puts Bundler::URI::VERSION\\\"\" | tail -1`" \
+  == '%{bundler_uri_version}' ]
 
 
 # test_debug(TestRubyOptions) fails due to LoadError reported in debug mode,
 # when abrt.rb cannot be required (seems to be easier way then customizing
 # the test suite).
-touch %{_vpath_builddir}/abrt.rb
+touch abrt.rb
 
 # Check if abrt hook is required (RubyGems are disabled by default when using
 # runruby, so re-enable them).
-make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE10}"
+make runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE13}"
 
 # Check if systemtap is supported.
-%if %{with systemtap}
-ln -sfr probes.d %{_vpath_builddir}/
-make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=%{SOURCE11}
-%endif
-
-# Test dependency generators for RPM
-GENERATOR_SCRIPT="%{SOURCE7}" \
-make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
-  -I%{_builddir}/%{buildsubdir}/tool/lib -I%{_sourcedir} --enable-gems \
-  %{SOURCE14} --verbose"
-GENERATOR_SCRIPT="%{SOURCE8}" \
-make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
-  -I%{_builddir}/%{buildsubdir}/tool/lib -I%{_sourcedir} --enable-gems \
-  %{SOURCE15} --verbose"
-GENERATOR_SCRIPT="%{SOURCE9}" \
-make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
-  -I%{_builddir}/%{buildsubdir}/tool/lib -I%{_sourcedir} --enable-gems \
-  %{SOURCE16} --verbose"
-
+%{?with_systemtap:make runruby TESTRUN_SCRIPT=%{SOURCE14}}
 
 DISABLE_TESTS=""
 MSPECOPTS=""
@@ -1226,14 +891,7 @@ MSPECOPTS=""
 # Give an option to increase the timeout in tests.
 # https://bugs.ruby-lang.org/issues/16921
 %{?test_timeout_scale:RUBY_TEST_TIMEOUT_SCALE="%{test_timeout_scale}"} \
-  make -C %{_vpath_builddir} %{?with_parallel_tests:%{?_smp_mflags}} check TESTS="-v --show-skip $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
-
-# Run Ruby OpenSSL tests in OpenSSL FIPS.
-make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
-  -I%{_builddir}/%{buildsubdir}/tool/lib --enable-gems \
-  %{SOURCE12} %{_builddir}/%{buildsubdir} --verbose"
-
-%{?with_bundler_tests:make -C %{_vpath_builddir} test-bundler-parallel}
+  make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 
 %files
 %license BSDL
@@ -1241,7 +899,9 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %lang(ja) %license COPYING.ja
 %license GPL
 %license LEGAL
+%{_bindir}/erb
 %{_bindir}/%{name}%{?with_rubypick:-mri}
+%{_mandir}/man1/erb*
 %{_mandir}/man1/ruby*
 
 %files devel
@@ -1251,7 +911,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %license GPL
 %license LEGAL
 
-%{_rpmmacrodir}/macros.ruby
+%{_rpmconfigdir}/macros.d/macros.ruby
 
 %{_includedir}/*
 %{_libdir}/libruby.so
@@ -1274,63 +934,83 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 # List all these files explicitly to prevent surprises
 # Platform independent libraries.
 %dir %{ruby_libdir}
+%exclude %{ruby_libdir}/bigdecimal*
+%exclude %{ruby_libdir}/irb*
 %exclude %{ruby_libdir}/json*
 %exclude %{ruby_libdir}/psych*
-%{ruby_libdir}/bundled_gems.rb
+%{ruby_libdir}/abbrev.rb
+%{ruby_libdir}/base64.rb
+%{ruby_libdir}/benchmark*
 %{ruby_libdir}/cgi*
 %{ruby_libdir}/coverage.rb
+%{ruby_libdir}/csv*
 %{ruby_libdir}/date.rb
+%{ruby_libdir}/debug.rb
 %{ruby_libdir}/delegate*
 %{ruby_libdir}/digest*
+%{ruby_libdir}/drb*
 %{ruby_libdir}/English.rb
-%{ruby_libdir}/erb*
-%{ruby_libdir}/error_highlight*
+%{ruby_libdir}/erb.rb
 %{ruby_libdir}/expect.rb
+%{ruby_libdir}/fiddle*
 %{ruby_libdir}/fileutils.rb
 %{ruby_libdir}/find.rb
 %{ruby_libdir}/forwardable*
+%{ruby_libdir}/getoptlong*
+%{ruby_libdir}/io
 %{ruby_libdir}/ipaddr.rb
+%{ruby_libdir}/kconv.rb
+%{ruby_libdir}/logger*
+%{ruby_libdir}/matrix*
 %{ruby_libdir}/mkmf.rb
 %{ruby_libdir}/monitor.rb
+%{ruby_libdir}/mutex_m.rb
 %{ruby_libdir}/net
-%{ruby_libdir}/objspace*
+%{ruby_libdir}/objspace.rb
+%{ruby_libdir}/observer*
 %{ruby_libdir}/open-uri.rb
 %{ruby_libdir}/open3*
 %{ruby_libdir}/optionparser.rb
 %{ruby_libdir}/optparse*
+%{ruby_libdir}/ostruct*
 %{ruby_libdir}/pathname.rb
 %{ruby_libdir}/pp.rb
 %{ruby_libdir}/prettyprint.rb
-%{ruby_libdir}/random
+%{ruby_libdir}/prime.rb
+%{ruby_libdir}/pstore*
+%{ruby_libdir}/readline.rb
+%{ruby_libdir}/reline*
 %{ruby_libdir}/resolv.rb
+%{ruby_libdir}/resolv-replace.rb
+%{ruby_libdir}/rinda
 %{ruby_libdir}/ripper*
 %{ruby_libdir}/securerandom.rb
-%{ruby_libdir}/set/subclass_compatible.rb
+%{ruby_libdir}/set*
 %{ruby_libdir}/shellwords.rb
 %{ruby_libdir}/singleton*
 %{ruby_libdir}/socket.rb
-%{ruby_libdir}/strscan
-%{ruby_libdir}/syntax_suggest*
+%{ruby_libdir}/syslog
 %{ruby_libdir}/tempfile.rb
 %{ruby_libdir}/timeout*
 %{ruby_libdir}/time.rb
 %{ruby_libdir}/tmpdir.rb
+%{ruby_libdir}/tracer*
 %{ruby_libdir}/tsort.rb
 %{ruby_libdir}/unicode_normalize
 %{ruby_libdir}/un.rb
 %{ruby_libdir}/uri*
 %{ruby_libdir}/weakref*
 %{ruby_libdir}/yaml*
-%{ruby_libdir}/prism*
 
 # Platform specific libraries.
-%{_libdir}/libruby.so.{%{major_minor_version},%{ruby_version}}
+%{_libdir}/libruby.so.*
 %dir %{ruby_libarchdir}
 %dir %{ruby_libarchdir}/cgi
 %{ruby_libarchdir}/cgi/escape.so
 %{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
@@ -1401,28 +1081,37 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{ruby_libarchdir}/enc/windows_1254.so
 %{ruby_libarchdir}/enc/windows_1257.so
 %{ruby_libarchdir}/enc/windows_31j.so
-%{ruby_libarchdir}/erb/escape.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
 %{ruby_libarchdir}/monitor.so
+%{ruby_libarchdir}/nkf.so
 %{ruby_libarchdir}/objspace.so
+%{ruby_libarchdir}/pathname.so
 %{ruby_libarchdir}/pty.so
 %dir %{ruby_libarchdir}/rbconfig
 %{ruby_libarchdir}/rbconfig.rb
 %{ruby_libarchdir}/rbconfig/sizeof.so
+%{ruby_libarchdir}/readline.so
 %{ruby_libarchdir}/ripper.so
 %{ruby_libarchdir}/socket.so
 %{ruby_libarchdir}/stringio.so
 %{ruby_libarchdir}/strscan.so
+%{ruby_libarchdir}/syslog.so
 %{ruby_libarchdir}/zlib.so
 
 # Default gems
 %{ruby_libdir}/did_you_mean*
 %{ruby_libdir}/openssl*
 %{ruby_libarchdir}/openssl.so
+%{ruby_libdir}/racc*
+%dir %{ruby_libarchdir}/racc
+%{ruby_libarchdir}/racc/cparse.so
 
 %{?with_systemtap:%{_systemtap_datadir}}
 
@@ -1449,84 +1138,106 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %exclude %{gem_dir}/cache/*
 
 %files -n rubygems-devel
-%{_rpmmacrodir}/macros.rubygems
-%{_fileattrsdir}/rubygems.attr
+%{_rpmconfigdir}/macros.d/macros.rubygems
+%{_rpmconfigdir}/fileattrs/rubygems.attr
 %{_rpmconfigdir}/rubygems.req
 %{_rpmconfigdir}/rubygems.prov
 %{_rpmconfigdir}/rubygems.con
 
 %files default-gems
-%gem_spec -d date
-%gem_spec -d delegate
-%gem_spec -d did_you_mean
-%gem_spec -d digest
-%gem_spec -d english
-%gem_spec -d erb
-%gem_instdir erb
-%{_bindir}/erb
-%{_mandir}/man1/erb*
-%gem_spec -d error_highlight
-%gem_spec -d etc
-%gem_spec -d fcntl
-%gem_spec -d fileutils
-%gem_spec -d find
-%gem_spec -d forwardable
-%gem_spec -d io-nonblock
-%gem_spec -d io-wait
-%gem_spec -d ipaddr
-%gem_spec -d net-http
-%gem_spec -d net-protocol
-%gem_spec -d open3
-%gem_spec -d open-uri
-%gem_spec -d optparse
-%gem_spec -d openssl
-%gem_spec -d pp
-%gem_spec -d prettyprint
-%gem_spec -d resolv
-%gem_spec -d ruby2_keywords
-%gem_spec -d securerandom
-%gem_spec -d shellwords
-%gem_spec -d singleton
-%gem_spec -d stringio
-%gem_spec -d strscan
-%gem_spec -d syntax_suggest
-%{_bindir}/syntax_suggest
-%gem_instdir syntax_suggest
-%gem_spec -d tempfile
-%gem_spec -d time
-%gem_spec -d timeout
-%gem_spec -d tmpdir
-%gem_spec -d tsort
-%gem_spec -d un
-%gem_spec -d uri
-%gem_spec -d weakref
-#%%gem_spec -d win32ole
-#%%gem_spec -d win32-registry
-%gem_spec -d yaml
-%gem_spec -d prism
-%gem_spec -d zlib
+%{gem_dir}/specifications/default/english-0.7.1.gemspec
+%{gem_dir}/specifications/default/abbrev-0.1.0.gemspec
+%{gem_dir}/specifications/default/base64-0.1.0.gemspec
+%{gem_dir}/specifications/default/benchmark-0.1.1.gemspec
+%{gem_dir}/specifications/default/cgi-0.2.1.gemspec
+%{gem_dir}/specifications/default/csv-3.1.9.gemspec
+%{gem_dir}/specifications/default/date-3.1.3.gemspec
+%{gem_dir}/specifications/default/dbm-1.1.0.gemspec
+%{gem_dir}/specifications/default/debug-0.2.1.gemspec
+%{gem_dir}/specifications/default/delegate-0.2.0.gemspec
+%{gem_dir}/specifications/default/did_you_mean-%{did_you_mean_version}.gemspec
+%{gem_dir}/specifications/default/digest-3.0.0.gemspec
+%{gem_dir}/specifications/default/drb-2.0.5.gemspec
+%{gem_dir}/specifications/default/erb-%{erb_version}.gemspec
+%{gem_dir}/specifications/default/etc-1.3.0.gemspec
+%{gem_dir}/specifications/default/fcntl-1.0.1.gemspec
+%{gem_dir}/specifications/default/fiddle-1.0.8.gemspec
+%{gem_dir}/specifications/default/fileutils-1.5.0.gemspec
+%{gem_dir}/specifications/default/find-0.1.0.gemspec
+%{gem_dir}/specifications/default/forwardable-1.3.2.gemspec
+%{gem_dir}/specifications/default/gdbm-2.1.0.gemspec
+%{gem_dir}/specifications/default/getoptlong-0.1.1.gemspec
+%{gem_dir}/specifications/default/io-nonblock-0.1.0.gemspec
+%{gem_dir}/specifications/default/io-wait-0.2.0.gemspec
+%{gem_dir}/specifications/default/ipaddr-1.2.2.gemspec
+%{gem_dir}/specifications/default/logger-1.4.3.gemspec
+%{gem_dir}/specifications/default/matrix-0.3.1.gemspec
+%{gem_dir}/specifications/default/mutex_m-0.1.1.gemspec
+%{gem_dir}/specifications/default/net-ftp-0.1.2.gemspec
+%{gem_dir}/specifications/default/net-http-0.1.1.gemspec
+%{gem_dir}/specifications/default/net-imap-0.1.1.gemspec
+%{gem_dir}/specifications/default/net-pop-0.1.1.gemspec
+%{gem_dir}/specifications/default/net-protocol-0.1.1.gemspec
+%{gem_dir}/specifications/default/net-smtp-0.2.1.gemspec
+%{gem_dir}/specifications/default/nkf-0.1.0.gemspec
+%{gem_dir}/specifications/default/observer-0.1.1.gemspec
+%{gem_dir}/specifications/default/open3-0.1.1.gemspec
+%{gem_dir}/specifications/default/open-uri-0.1.0.gemspec
+%{gem_dir}/specifications/default/optparse-0.1.1.gemspec
+%{gem_dir}/specifications/default/openssl-%{openssl_version}.gemspec
+%{gem_dir}/specifications/default/ostruct-0.3.1.gemspec
+%{gem_dir}/specifications/default/pathname-0.1.0.gemspec
+%{gem_dir}/specifications/default/pp-0.2.1.gemspec
+%{gem_dir}/specifications/default/prettyprint-0.1.1.gemspec
+%{gem_dir}/specifications/default/prime-0.1.2.gemspec
+%{gem_dir}/specifications/default/pstore-0.1.1.gemspec
+%{gem_dir}/specifications/default/racc-%{racc_version}.gemspec
+%{gem_dir}/specifications/default/readline-0.0.2.gemspec
+%{gem_dir}/specifications/default/readline-ext-0.1.1.gemspec
+%{gem_dir}/specifications/default/reline-0.2.5.gemspec
+%{gem_dir}/specifications/default/resolv-0.2.1.gemspec
+%{gem_dir}/specifications/default/resolv-replace-0.1.0.gemspec
+%{gem_dir}/specifications/default/rinda-0.1.1.gemspec
+%{gem_dir}/specifications/default/securerandom-0.1.0.gemspec
+%{gem_dir}/specifications/default/set-1.0.1.gemspec
+%{gem_dir}/specifications/default/shellwords-0.1.0.gemspec
+%{gem_dir}/specifications/default/singleton-0.1.1.gemspec
+%{gem_dir}/specifications/default/stringio-3.0.1.gemspec
+%{gem_dir}/specifications/default/strscan-3.0.1.gemspec
+%{gem_dir}/specifications/default/syslog-0.1.0.gemspec
+%{gem_dir}/specifications/default/tempfile-0.1.1.gemspec
+%{gem_dir}/specifications/default/time-0.1.0.gemspec
+%{gem_dir}/specifications/default/timeout-0.1.1.gemspec
+%{gem_dir}/specifications/default/tmpdir-0.1.2.gemspec
+%{gem_dir}/specifications/default/tsort-0.1.0.gemspec
+%{gem_dir}/specifications/default/tracer-0.1.1.gemspec
+%{gem_dir}/specifications/default/un-0.1.0.gemspec
+%{gem_dir}/specifications/default/uri-0.10.1.gemspec
+%{gem_dir}/specifications/default/weakref-0.1.1.gemspec
+#%%{gem_dir}/specifications/default/win32ole-1.8.8.gemspec
+%{gem_dir}/specifications/default/yaml-0.1.1.gemspec
+%{gem_dir}/specifications/default/zlib-2.0.0.gemspec
+
+%{gem_dir}/gems/erb-%{erb_version}
+# Use standalone rubygem-racc if Racc binary is required. Shipping this
+# executable in both packages might possibly cause conflicts. The situation
+# could be better if Ruby generated these files:
+# https://github.com/ruby/ruby/pull/2545
+%exclude %{_bindir}/racc
+%exclude %{gem_dir}/gems/racc-%{racc_version}/bin
 
 %files -n rubygem-irb
 %{_bindir}/irb
-%dir %{gem_instdir irb}
-%{gem_libdir irb}
-%{gem_spec irb}
-%{gem_instdir irb}/exe
-
-%{gem_instdir irb}/Gemfile
-%license %{gem_instdir irb}/LICENSE.txt
-%doc %{gem_instdir irb}/doc
-%doc %{gem_instdir irb}/README.md
-%doc %{gem_instdir irb}/CONTRIBUTING.md
-%doc %{gem_instdir irb}/EXTEND_IRB.md
+%{ruby_libdir}/irb*
+%{gem_dir}/gems/irb-%{irb_version}
+%{gem_dir}/specifications/irb-%{irb_version}.gemspec
 %{_mandir}/man1/irb.1*
 
 %files -n rubygem-rdoc
 %{_bindir}/rdoc
 %{_bindir}/ri
-%{gem_instdir rdoc}
-%{gem_spec rdoc}
-%{gem_plugin rdoc}
+%{gem_dir}/gems/rdoc-%{rdoc_version}
+%{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
 %{_mandir}/man1/ri*
 
 %files doc -f .ruby-doc.en -f .ruby-doc.ja
@@ -1536,683 +1247,132 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{_datadir}/ri
 
 %files -n rubygem-bigdecimal
-%{gem_extdir_mri bigdecimal}
-%{gem_instdir bigdecimal}
-%{gem_spec 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
 
 %files -n rubygem-io-console
 %{ruby_libdir}/io
 %{ruby_libarchdir}/io/console.so
-%{gem_extdir_mri io-console}
-%{gem_instdir io-console}
-%{gem_spec io-console}
+%{_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
 
 %files -n rubygem-json
 %{ruby_libdir}/json*
 %{ruby_libarchdir}/json*
-%{gem_extdir_mri json}
-%{gem_instdir json}
-%{gem_spec json}
+%{_libdir}/gems/%{name}/json-%{json_version}
+%{gem_dir}/gems/json-%{json_version}
+%{gem_dir}/specifications/json-%{json_version}.gemspec
 
 %files -n rubygem-psych
 %{ruby_libdir}/psych
 %{ruby_libdir}/psych.rb
 %{ruby_libarchdir}/psych.so
-%{gem_extdir_mri psych}
-%dir %{gem_instdir psych}
-%{gem_libdir psych}
-%{gem_spec psych}
+%{_libdir}/gems/%{name}/psych-%{psych_version}
+%{gem_dir}/gems/psych-%{psych_version}
+%{gem_dir}/specifications/psych-%{psych_version}.gemspec
 
 %files -n rubygem-bundler
 %{_bindir}/bundle
 %{_bindir}/bundler
-%{gem_instdir bundler}
-%{gem_spec bundler}
+%{gem_dir}/gems/bundler-%{bundler_version}
+%{gem_dir}/specifications/bundler-%{bundler_version}.gemspec
 %{_mandir}/man1/bundle*.1*
 %{_mandir}/man5/gemfile.5*
 
-%files bundled-gems
-# abbrev
-%dir %{gem_instdir abbrev}
-%license %{gem_instdir abbrev}/LICENSE.txt
-%{gem_instdir abbrev}/bin
-%{gem_libdir abbrev}
-%{gem_spec abbrev}
-%{gem_instdir abbrev}/Gemfile
-%doc %{gem_instdir abbrev}/README.md
-%{gem_instdir abbrev}/Rakefile
-
-# base64
-%dir %{gem_instdir base64}
-%license %{gem_instdir base64}/BSDL
-%license %{gem_instdir base64}/COPYING
-%license %{gem_instdir base64}/LEGAL
-%{gem_instdir base64}/sig
-%{gem_libdir base64}
-%{gem_spec base64}
-%doc %{gem_instdir base64}/README.md
-
-# benchmark
-%dir %{gem_instdir benchmark}
-%license %{gem_instdir benchmark}/BSDL
-%license %{gem_instdir benchmark}/COPYING
-%doc %{gem_instdir benchmark}/README.md
-%{gem_instdir benchmark}/Gemfile
-%{gem_instdir benchmark}/Rakefile
-%{gem_instdir benchmark}/bin
-%{gem_libdir benchmark}
-%{gem_spec benchmark}
-
-# csv
-%dir %{gem_instdir csv}
-%license %{gem_instdir csv}/LICENSE.txt
-%doc %{gem_instdir csv}/NEWS.md
-%{gem_libdir csv}
-%{gem_spec csv}
-%doc %{gem_instdir csv}/README.md
-%doc %{gem_instdir csv}/doc
-
-# drb
-%dir %{gem_instdir drb}
-%license %{gem_instdir drb}/LICENSE.txt
-%{gem_libdir drb}
-%{gem_instdir drb}/drb.gemspec
-%{gem_spec drb}
-
-# getoptlong
-%dir %{gem_instdir getoptlong}
-%license %{gem_instdir getoptlong}/LICENSE.txt
-%{gem_instdir getoptlong}/bin
-%{gem_libdir getoptlong}
-%{gem_instdir getoptlong}/sample
-%{gem_spec getoptlong}
-%{gem_instdir getoptlong}/Gemfile
-%doc %{gem_instdir getoptlong}/README.md
-%{gem_instdir getoptlong}/Rakefile
-
-# fiddle
-%dir %{gem_instdir fiddle}
-%license %{gem_instdir fiddle}/LICENSE.txt
-%doc %{gem_instdir fiddle}/README.md
-%{gem_instdir fiddle}/Rakefile
-%{gem_libdir fiddle}
-%dir %{gem_extdir_mri fiddle}
-%{gem_extdir_mri fiddle}/fiddle.so
-%{gem_extdir_mri fiddle}/gem.build_complete
-%{gem_instdir fiddle}/fiddle.gemspec
-%{gem_spec fiddle}
-
-# logger
-%dir %{gem_instdir logger}
-%license %{gem_instdir logger}/BSDL
-%license %{gem_instdir logger}/COPYING
-%doc %{gem_instdir logger}/README.md
-%{gem_libdir logger}
-%{gem_spec logger}
-
-# matrix
-%dir %{gem_instdir matrix}
-%license %{gem_instdir matrix}/BSDL
-%license %{gem_instdir matrix}/COPYING
-%{gem_libdir matrix}
-%{gem_instdir matrix}/matrix.gemspec
-%{gem_spec matrix}
-
-# mutex_m
-%dir %{gem_instdir mutex_m}
-%license %{gem_instdir mutex_m}/BSDL
-%license %{gem_instdir mutex_m}/COPYING
-%{gem_libdir mutex_m}
-%{gem_instdir mutex_m}/sig
-%{gem_spec mutex_m}
-%doc %{gem_instdir mutex_m}/README.md
-
-# net-ftp
-%dir %{gem_instdir net-ftp}
-%license %{gem_instdir net-ftp}/BSDL
-%license %{gem_instdir net-ftp}/COPYING
-%{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_instdir net-imap}
-%license %{gem_instdir net-imap}/BSDL
-%license %{gem_instdir net-imap}/COPYING
-%{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}/docs
-%{gem_libdir net-imap}
-%{gem_instdir net-imap}/rakelib
-%{gem_instdir net-imap}/sample
-%{gem_spec net-imap}
-
-# net-pop
-%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-smtp
-%dir %{gem_instdir net-smtp}
-%doc %{gem_instdir net-smtp}/NEWS.md
-%doc %{gem_instdir net-smtp}/README.md
-%license %{gem_instdir net-smtp}/LICENSE.txt
-%{gem_libdir net-smtp}
-%{gem_spec net-smtp}
-
-# nkf
-%dir %{gem_instdir nkf}
-%{gem_extdir_mri nkf}
-%license %{gem_instdir nkf}/LICENSE.txt
-%{gem_instdir nkf}/bin
-%{gem_libdir nkf}
-%{gem_spec nkf}
-%{gem_instdir nkf}/Gemfile
-%doc %{gem_instdir nkf}/README.md
-%{gem_instdir nkf}/Rakefile
-
-# observer
-%dir %{gem_instdir observer}
-%license %{gem_instdir observer}/LICENSE.txt
-%{gem_instdir observer}/bin
-%{gem_libdir observer}
-%exclude %{gem_cache observer}
-%{gem_spec observer}
-%{gem_instdir observer}/Gemfile
-%doc %{gem_instdir observer}/README.md
-%{gem_instdir observer}/Rakefile
-
-# ostruct
-%dir %{gem_instdir ostruct}
-%license %{gem_instdir ostruct}/BSDL
-%license %{gem_instdir ostruct}/COPYING
-%doc %{gem_instdir ostruct}/README.md
-%{gem_instdir ostruct}/Gemfile
-%{gem_instdir ostruct}/Rakefile
-%{gem_instdir ostruct}/bin
-%{gem_libdir ostruct}
-%{gem_instdir ostruct}/ostruct.gemspec
-%{gem_spec ostruct}
-
-# prime
-%dir %{gem_instdir prime}
-%license %{gem_instdir prime}/BSDL
-%license %{gem_instdir prime}/COPYING
-%doc %{gem_instdir prime}/README.md
-%{gem_instdir prime}/Rakefile
-%{gem_libdir prime}
-%{gem_instdir prime}/sig
-%{gem_instdir prime}/prime.gemspec
-%{gem_spec prime}
-
-# pstore
-%dir %{gem_instdir pstore}
-%license %{gem_instdir pstore}/BSDL
-%license %{gem_instdir pstore}/COPYING
-%doc %{gem_instdir pstore}/README.md
-%{gem_instdir pstore}/Gemfile
-%{gem_instdir pstore}/Rakefile
-%{gem_instdir pstore}/bin
-%{gem_libdir pstore}
-%{gem_spec pstore}
-
-# rdbg
-%{_bindir}/rdbg
-%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}
-
-# readline
-%dir %{gem_instdir readline}
-%license %{gem_instdir readline}/BSDL
-%license %{gem_instdir readline}/COPYING
-%doc %{gem_instdir readline}/README.md
-%{gem_libdir readline}
-%{gem_spec readline}
-
-# reline
-%dir %{gem_instdir reline}
-%license %{gem_instdir reline}/BSDL
-%license %{gem_instdir reline}/COPYING
-%license %{gem_instdir reline}/license_of_rb-readline
-%doc %{gem_instdir reline}/README.md
-%{gem_libdir reline}
-%{gem_spec reline}
-
-# repl_type_completor
-%dir %{gem_instdir repl_type_completor}
-%license %{gem_instdir repl_type_completor}/LICENSE.txt
-%{gem_libdir repl_type_completor}
-%{gem_instdir repl_type_completor}/sig
-%exclude %{gem_cache repl_type_completor}
-%{gem_spec repl_type_completor}
-%{gem_instdir repl_type_completor}/Gemfile
-%doc %{gem_instdir repl_type_completor}/README.md
-%{gem_instdir repl_type_completor}/Rakefile
-
-# rinda
-%dir %{gem_instdir rinda}
-%license %{gem_instdir rinda}/LICENSE.txt
-%{gem_instdir rinda}/bin
-%{gem_libdir rinda}
-%{gem_spec rinda}
-%{gem_instdir rinda}/Gemfile
-%doc %{gem_instdir rinda}/README.md
-%{gem_instdir rinda}/Rakefile
-
-# resolv-replace
-%dir %{gem_instdir resolv-replace}
-%license %{gem_instdir resolv-replace}/LICENSE.txt
-%{gem_instdir resolv-replace}/bin
-%{gem_libdir resolv-replace}
-%{gem_spec resolv-replace}
-%{gem_instdir resolv-replace}/Gemfile
-%doc %{gem_instdir resolv-replace}/README.md
-%{gem_instdir resolv-replace}/Rakefile
-
-# syslog
-%dir %{gem_instdir syslog}
-%{gem_extdir_mri syslog}
-%license %{gem_instdir syslog}/BSDL
-%license %{gem_instdir syslog}/COPYING
-%{gem_instdir syslog}/bin
-%{gem_libdir syslog}
-%exclude %{gem_cache syslog}
-%{gem_spec syslog}
-%{gem_instdir syslog}/Gemfile
-%doc %{gem_instdir syslog}/README.md
-%{gem_instdir syslog}/Rakefile
-
 %files -n rubygem-minitest
-%{_bindir}/minitest
-%dir %{gem_instdir minitest}
-%exclude %{gem_instdir minitest}/.*
-%{gem_instdir minitest}/Manifest.txt
-%{gem_instdir minitest}/design_rationale.rb
-%{gem_instdir minitest}/bin
-%{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
+%{gem_dir}/gems/minitest-%{minitest_version}
+%exclude %{gem_dir}/gems/minitest-%{minitest_version}/.*
+%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
 
 %files -n rubygem-power_assert
-%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
+%{gem_dir}/gems/power_assert-%{power_assert_version}
+%exclude %{gem_dir}/gems/power_assert-%{power_assert_version}/.*
+%{gem_dir}/specifications/power_assert-%{power_assert_version}.gemspec
 
 %files -n rubygem-rake
 %{_bindir}/rake
-%{gem_instdir rake}
-%{gem_spec rake}
+%{gem_dir}/gems/rake-%{rake_version}
+%{gem_dir}/specifications/rake-%{rake_version}.gemspec
 %{_mandir}/man1/rake.1*
 
 %files -n rubygem-rbs
 %{_bindir}/rbs
-%dir %{gem_extdir_mri rbs}
-%{gem_extdir_mri rbs}/gem.build_complete
-%{gem_extdir_mri rbs}/rbs_extension.so
-%dir %{gem_instdir rbs}
-%license %{gem_instdir rbs}/BSDL
-%doc %{gem_instdir rbs}/CHANGELOG.md
-%license %{gem_instdir rbs}/COPYING
-%doc %{gem_instdir rbs}/README.md
-%{gem_instdir rbs}/Rakefile
-%{gem_instdir rbs}/Steepfile
-%{gem_instdir rbs}/config.yml
-%{gem_instdir rbs}/core
-%doc %{gem_instdir rbs}/docs
-%{gem_instdir rbs}/exe
-%{gem_instdir rbs}/goodcheck.yml
-%{gem_instdir rbs}/include
-%{gem_libdir rbs}
-%{gem_instdir rbs}/schema
-%{gem_instdir rbs}/sig
-%{gem_instdir rbs}/src
-%{gem_instdir rbs}/stdlib
-%{gem_spec rbs}
+%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}/gems/rbs-%{rbs_version}/steep
+%{gem_dir}/specifications/rbs-%{rbs_version}.gemspec
 
 %files -n rubygem-test-unit
-%{_bindir}/test-unit
-%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_instdir test-unit}/bin
-%{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-racc
-%dir %{gem_instdir racc}
-%{_bindir}/racc
-%{gem_extdir_mri racc}
-%license %{gem_instdir racc}/BSDL
-%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}
+%{gem_dir}/gems/test-unit-%{test_unit_version}
+%{gem_dir}/specifications/test-unit-%{test_unit_version}.gemspec
 
 %files -n rubygem-rexml
-%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
+%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
 
 %files -n rubygem-rss
-%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
+%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}/Gemfile
+%doc %{gem_dir}/gems/rss-%{rss_version}/README.md
+%doc %{gem_dir}/gems/rss-%{rss_version}/Rakefile
+%doc %{gem_dir}/gems/rss-%{rss_version}/test
 
 %files -n rubygem-typeprof
-%dir %{gem_instdir typeprof}
+%dir %{gem_dir}/gems/typeprof-%{typeprof_version}
 %{_bindir}/typeprof
-%exclude %{gem_instdir typeprof}/.*
-%license %{gem_instdir typeprof}/LICENSE
-%{gem_instdir typeprof}/bin
-%{gem_instdir typeprof}/typeprof.conf.jsonc
-%doc %{gem_instdir typeprof}/doc
-%{gem_libdir typeprof}
-%{gem_spec typeprof}
-%doc %{gem_instdir typeprof}/README.md
+%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}/smoke
+%doc %{gem_dir}/gems/typeprof-%{typeprof_version}/tools
+%{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
+%doc %{gem_dir}/gems/typeprof-%{typeprof_version}/doc
+%lang(ja) %doc %{gem_dir}/gems/typeprof-%{typeprof_version}/doc/doc.ja.md
+%doc %{gem_dir}/gems/typeprof-%{typeprof_version}/testbed
 
 
 %changelog
-* Tue Jan 13 2026 Vít Ondruch <vondruch@redhat.com> - 4.0.1-31
-- Upgrade to Ruby 4.0.1.
-  Resolves: rhbz#2428861
-
-* Fri Jan 02 2026 Jarek Prokop <jprokop@redhat.com> - 4.0.0-30
-- Upgrade to Ruby 4.0.0.
-  Resolves: rhbz#2425358
-
-* Wed Dec 17 2025 Vít Ondruch <vondruch@redhat.com> - 3.4.8-29
-- Update to Ruby 3.4.8.
-  Resolves: rhbz#2422963
-  Resolves: rhbz#2412227
-
-* Tue Oct 21 2025 Jun Aruga <jaruga@redhat.com> - 3.4.7-28
-- Upgrade to Ruby 3.4.7.
-  Resolves: rhbz#2402422
-- Fix URI Credential Leakage Bypass previous fixes.
-  Resolves: CVE-2025-61594
-- Fix REXML denial of service.
-  Resolves: CVE-2025-58767
-
-* Mon Aug 18 2025 Jarek Prokop <jprokop@redhat.com> - 3.4.5-27
-- Upgrade to Ruby 3.4.5.
-  Resolves: rhbz#2380246
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed Jun 11 2025 Jarek Prokop <jprokop@redhat.com> - 3.4.4-25
-- Upgrade to Ruby 3.4.4.
-  Resolves: rhbz#2359563
-
-* Tue Apr 08 2025 Jun Aruga <jaruga@redhat.com> - 3.4.2-24
-- Fix the tests using SHA-1 Probabilistic Signature Scheme (PSS) parameters.
-  Resolves: rhbz#2358256
-
-* Wed Feb 19 2025 Vít Ondruch <vondruch@redhat.com> - 3.4.2-23
-- Upgrade to Ruby 3.4.2.
-  Resolves: rhbz#2345875
-
-* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 3.4.1-23
-- Add explicit BR: libxcrypt-devel
-
-* Fri Jan 24 2025 Jarek Prokop <jprokop@redhat.com> - 3.4.1-22
-- Stop including <cstdbool> C++ header, it is deprecated since C++17.
-  Resolves: rhbz#2336567
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jan 08 2025 Vít Ondruch <vondruch@redhat.com> - 3.4.1-20
-- Re-enable FIPS test cases.
-
-* Thu Jan 02 2025 Vít Ondruch <vondruch@redhat.com> - 3.4.1-19
-- Upgrade to Ruby 3.4.1.
-  Resolves: rhbz#2334047
-
-* Mon Dec 16 2024 Jun Aruga <jaruga@redhat.com> - 3.3.6-18
-- Fix Ruby OpenSSL to respect crypto-policies TLS minimal version.
-
-* Wed Nov 20 2024 David Abdurachmanov <davidlt@rivosinc.com> - 3.3.6-17
-- Add riscv64 information for checksec
-
-* Mon Nov 11 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.6-16
-- Upgrade to Ruby 3.3.6.
-
-* Fri Sep 13 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.5-15
-- Fix Bundler `--local` option
-  Resolves: rhbz#2311898
-
-* Tue Sep 03 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.5-14
-- Upgrade to Ruby 3.3.5.
-  Resolves: rhbz#2309364
-
-* Mon Jul 29 2024 Jun Aruga <jaruga@redhat.com> - 3.3.4-13
-- Add systemtap-sdt-devel to build Ruby with systemtap sdt header files.
-  Co-authored-by: Lumír Balhar <lbalhar@redhat.com>
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jul 10 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.4-11
-- Upgrade to Ruby 3.3.4.
-  Resolves: rhbz#2292052
-
-* Tue Jun 18 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.2-10
-- Make sure hardening configuration flags are correctly applied.
-
-* Thu Jun 06 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.2-9
-- Upgrade to Ruby 3.3.2.
-  Resolves: rhbz#2284020
-
-* Tue May 28 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.1-8
-- Adjust the test to updated `checksec` output.
-  Resolves: rhbz#2282953
-- Make sure fortification flags are applied.
-
-* Tue Apr 23 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.1-7
-- Upgrade to Ruby 3.3.1.
-  Resolves: rhbz#2276680
-
-* Fri Apr 12 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.0-6
-- Add `bundled` provide for NKF.
-- License review and fixes of SPDX syntax.
-
-* Wed Mar 06 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.0-5
-- Fix FTBFS caused by OpenSSL 3.2.1 update.
-
-* Fri Jan 26 2024 Jarek Prokop <jprokop@redhat.com> - 3.3.0-4
-- Do not set AI_ADDRCONFIG by default when calling getaddrinfo(3).
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 15 2024 Jarek Prokop <jprokop@redhat.com> - 3.3.0-2
-- Fix compiling coroutines with aarch64's branch protection.
-
-* Tue Jan 02 2024 Vít Ondruch <vondruch@redhat.com> - 3.3.0-1
-- Upgrade to Ruby 3.3.0.
-  Resolves: rhbz#2255918
-
-* Thu Nov 09 2023 Jun Aruga <jaruga@redhat.com> - 3.2.2-183
-- ssl: use ffdhe2048 from RFC 7919 as the default DH group parameters
-
-* Thu Nov 02 2023 Jarek Prokop <jprokop@redhat.com> - 3.2.2-183
-- Fix typo in bundled provide of rubygem-bundler for rubygem-net-http-persistent.
-
-* Wed Sep 20 2023 Jun Aruga <jaruga@redhat.com> - 3.2.2-182
-- Fix OpenSSL.fips_mode and OpenSSL::PKey.read in OpenSSL 3 FIPS.
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Mar 31 2023 Vít Ondruch <vondruch@redhat.com> - 3.2.2-180
-- Upgrade to Ruby 3.2.2.
-  Resolves: rhbz#2183284
-
-* Thu Feb 09 2023 Vít Ondruch <vondruch@redhat.com> - 3.2.1-179
-- Upgrade to Ruby 3.2.1.
-  Resolves: rhbz#2168292
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jan 05 2023 Vít Ondruch <vondruch@redhat.com> - 3.2.0-177
-- Fix ELN FTBFS due to stronger crypto settings.
-
-* Mon Jan 02 2023 Vít Ondruch <vondruch@redhat.com> - 3.2.0-176
-- Upgrade to Ruby 3.2.0.
-
-* Thu Dec 22 2022 Yaakov Selkowitz <yselkowi@redhat.com> - 3.1.3-175
-- Use SHA256 instead of SHA1 where needed in Openssl tests
-- Let OpenSSL choose the digest if digest for Openssl::OCSP::BasicResponse#sign is nil
-
-* Wed Dec 21 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.3-174
-- Fix for tzdata-2022g.
-
-* Thu Dec 08 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.3-173
-- Disable MJIT test cases on i686 due to issues with PCH.
-- Fix CGI causing issue with leading '.' in domain names.
-
-* Thu Nov 24 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.3-172
-- Upgrade to Ruby 3.1.3.
-
-* Tue Nov 22 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.2-171
-- Re-disable package notes. It causes additional issues with installing binary
-  gems.
-
-* Thu Sep 29 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.2-170
-- Re-enable package notes.
-
-* Fri Sep 02 2022 Jarek Prokop <jprokop@redhat.com> - 3.1.2-169
-- Disable fiddle tests that use FFI closures.
-  Related: rhbz#2040380
-
-* Mon Aug 29 2022 Jun Aruga <jaruga@redhat.com> - 3.1.2-168
-- Make RDoc soft dependnecy in IRB.
-  Resolves: rhbz#2119964
-- Add IRB to ruby-bundled-gems recommends.
-  Resolves: rhbz#2120562
-
-* Wed Aug 24 2022 Jun Aruga <jaruga@redhat.com> - 3.1.2-168
-- Fix tests with Europe/Amsterdam pre-1970 time on tzdata version 2022b.
-  Resolves: rhbz#2120354
-
-* Mon Jul 25 2022 Jarek Prokop <jprokop@redhat.com> - 3.1.2-167
-- Fix directory permissions in one of the rubygems tests.
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jun 16 2022 Jarek Prokop <jprokop@redhat.com> - 3.1.2-166
-- Detect compaction support during run time.
-
-* Tue Jun 07 2022 Jarek Prokop <jprokop@redhat.com> - 3.1.2-165
-- Define GC compaction methods as rb_f_notimplement on unsupported platforms.
-
-* Thu Apr 14 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.2-164
-- Upgrade to Ruby 3.1.2.
-- Use upstream patch for correct build of gem extensions.
-
-* Mon Apr 04 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.1-163
-- Properly build binary gem extensions.
-
-* Mon Mar 14 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.1-162
-- Upgrade to Ruby 3.1.1.
-
-* Thu Feb 10 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.0-161
-- Prevent segfaults running with SystemTap.
-
-* Wed Jan 26 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.0-160
-- Upgrade to Ruby 3.1.0.
-
-* Tue Jan 25 2022 Vít Ondruch <vondruch@redhat.com> - 3.0.3-159
-- Update OpenSSL 3 compatibility patches.
-
-* Thu Jan 20 2022 Vít Ondruch <vondruch@redhat.com> - 3.0.3-158
-- Disable package notes to prevent rubygem- build breakage.
-
-* Thu Jan 20 2022 Vít Ondruch <vondruch@redhat.com> - 3.0.3-157
-- Fix segfault in `TestArray#test_sample` on s390x.
-
-* Tue Jan 11 2022 Jun Aruga <jaruga@redhat.com> - 3.0.3-157
-- Remove the patch applied to pass the test/fiddle/test_import.rb on PPC.
-
-* Mon Jan 10 2022 Miro Hrončok <mhroncok@redhat.com> - 3.0.3-156
-- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
-
-* Thu Dec 09 2021 Vít Ondruch <vondruch@redhat.com> - 3.0.3-155
+* Wed Apr 27 2022 Vít Ondruch <vondruch@redhat.com> - 3.0.4-153
 - Fix loading of default gems.
   Resolves: rhbz#2027099
 
-* Thu Nov 25 2021 Vít Ondruch <vondruch@redhat.com> - 3.0.3-154
-- Upgrade to Ruby 3.0.3.
+* Tue Apr 19 2022 Vít Ondruch <vondruch@redhat.com> - 3.0.4-152
+- Upgrade to Ruby 3.0.4.
 
-* Fri Nov 05 2021 Vít Ondruch <vondruch@redhat.com> - 3.0.2-153
-- Fix OpenSSL 3.0 compatibility.
-  Resolves: rhbz#2021922
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com>
-- Rebuilt with OpenSSL 3.0.0
-
-* Tue Aug 24 2021 Vít Ondruch <vondruch@redhat.com> - 3.0.2-152
-- Enable LTO.
-- Load user installed RubyGems plugins.
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jul 13 2021 Jarek Prokop <jprokop@redhat.com> - 3.0.2-150
+* Tue Jul 13 2021 Jarek Prokop <jprokop@redhat.com> - 3.0.2-149
 - Upgrade to Ruby 3.0.2.
 - Fix command injection vulnerability in RDoc.
   Resolves: CVE-2021-31799
@@ -2224,9 +1384,6 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
   source.
   Resolves: CVE-2020-36327
 
-* Mon May 17 2021 Timm Bäder <tbaeder@redhat.com> - 3.0.1-149
-- Pass ldflags to gem install via CONFIGURE_ARGS
-
 * Tue Apr 06 2021 Vít Ondruch <vondruch@redhat.com> - 3.0.1-148
 - Upgrade to Ruby 3.0.1.
 
diff --git a/rubygems-3.2.33-Fix-loading-operating_system-rb-customizations-too-late.patch b/rubygems-3.2.33-Fix-loading-operating_system-rb-customizations-too-late.patch
new file mode 100644
index 0000000..d61020d
--- /dev/null
+++ b/rubygems-3.2.33-Fix-loading-operating_system-rb-customizations-too-late.patch
@@ -0,0 +1,262 @@
+From e80e7a3d0b3d72f7af7286b935702b3fab117008 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
+Date: Wed, 8 Dec 2021 21:12:24 +0100
+Subject: [PATCH 1/5] More explicit require
+
+This class does not use `rubygems/deprecate`. It uses
+`rubygems/version`, which in turn uses `rubygems/deprecate`. Make this
+explicit.
+---
+ lib/rubygems/requirement.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rubygems/requirement.rb b/lib/rubygems/requirement.rb
+index d2e28fab5b4..9edd6aa7d3c 100644
+--- a/lib/rubygems/requirement.rb
++++ b/lib/rubygems/requirement.rb
+@@ -1,5 +1,5 @@
+ # frozen_string_literal: true
+-require_relative "deprecate"
++require_relative "version"
+ 
+ ##
+ # A Requirement is a set of one or more version restrictions. It supports a
+
+From 4e46dcc17ee5cabbde43b8a34063b8ab042536f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
+Date: Wed, 8 Dec 2021 21:17:30 +0100
+Subject: [PATCH 2/5] Remove ineffective autoloads
+
+These files are loaded on startup unconditionally, so we can require
+them relatively when needed.
+---
+ lib/rubygems.rb               | 4 +---
+ lib/rubygems/specification.rb | 2 ++
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/rubygems.rb b/lib/rubygems.rb
+index f803e47628e..b8747409304 100644
+--- a/lib/rubygems.rb
++++ b/lib/rubygems.rb
+@@ -1310,19 +1310,17 @@ def default_gem_load_paths
+   autoload :Licenses,           File.expand_path('rubygems/util/licenses', __dir__)
+   autoload :NameTuple,          File.expand_path('rubygems/name_tuple', __dir__)
+   autoload :PathSupport,        File.expand_path('rubygems/path_support', __dir__)
+-  autoload :Platform,           File.expand_path('rubygems/platform', __dir__)
+   autoload :RequestSet,         File.expand_path('rubygems/request_set', __dir__)
+-  autoload :Requirement,        File.expand_path('rubygems/requirement', __dir__)
+   autoload :Resolver,           File.expand_path('rubygems/resolver', __dir__)
+   autoload :Source,             File.expand_path('rubygems/source', __dir__)
+   autoload :SourceList,         File.expand_path('rubygems/source_list', __dir__)
+   autoload :SpecFetcher,        File.expand_path('rubygems/spec_fetcher', __dir__)
+-  autoload :Specification,      File.expand_path('rubygems/specification', __dir__)
+   autoload :Util,               File.expand_path('rubygems/util', __dir__)
+   autoload :Version,            File.expand_path('rubygems/version', __dir__)
+ end
+ 
+ require_relative 'rubygems/exceptions'
++require_relative 'rubygems/specification'
+ 
+ # REFACTOR: This should be pulled out into some kind of hacks file.
+ begin
+diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
+index d3b96491a28..dc5e5ba0138 100644
+--- a/lib/rubygems/specification.rb
++++ b/lib/rubygems/specification.rb
+@@ -9,6 +9,8 @@
+ require_relative 'deprecate'
+ require_relative 'basic_specification'
+ require_relative 'stub_specification'
++require_relative 'platform'
++require_relative 'requirement'
+ require_relative 'specification_policy'
+ require_relative 'util/list'
+ 
+
+From 96b6b3e04e8e4fec17f63079a0caf999a2709d71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
+Date: Wed, 8 Dec 2021 21:45:16 +0100
+Subject: [PATCH 3/5] Load `operating_system.rb` customizations before setting
+ up default gems
+
+It's very common for packagers to configure gem paths in this file, for
+example, `Gem.default_dir`. Also, setting up default gems requires these
+paths to be set, so that we know which default gems need to be setup.
+
+If we setup default gems before loading `operatin_system.rb`
+customizations, the wrong default gems will be setup.
+
+Unfortunately, default gems loaded by `operating_system.rb` can't be
+upgraded if we do this, but it seems much of a smaller issue. I wasn't
+even fully sure it was the right thing to do when I added that, and it
+was not the culprit of the end user issue that led to making that
+change.
+---
+ .github/workflows/install-rubygems.yml |  5 ----
+ lib/rubygems.rb                        | 32 +++++++++++++-------------
+ test/rubygems/test_rubygems.rb         | 23 ++++++++++++++++++
+ 3 files changed, 39 insertions(+), 21 deletions(-)
+
+diff --git a/lib/rubygems.rb b/lib/rubygems.rb
+index b8747409304..11474b6554c 100644
+--- a/lib/rubygems.rb
++++ b/lib/rubygems.rb
+@@ -1323,22 +1323,6 @@ def default_gem_load_paths
+ require_relative 'rubygems/specification'
+ 
+ # REFACTOR: This should be pulled out into some kind of hacks file.
+-begin
+-  ##
+-  # Defaults the Ruby implementation wants to provide for RubyGems
+-
+-  require "rubygems/defaults/#{RUBY_ENGINE}"
+-rescue LoadError
+-end
+-
+-##
+-# Loads the default specs.
+-Gem::Specification.load_defaults
+-
+-require_relative 'rubygems/core_ext/kernel_gem'
+-require_relative 'rubygems/core_ext/kernel_require'
+-require_relative 'rubygems/core_ext/kernel_warn'
+-
+ begin
+   ##
+   # Defaults the operating system (or packager) wants to provide for RubyGems.
+@@ -1354,3 +1338,19 @@ def default_gem_load_paths
+     "the problem and ask for help."
+   raise e.class, msg
+ end
++
++begin
++  ##
++  # Defaults the Ruby implementation wants to provide for RubyGems
++
++  require "rubygems/defaults/#{RUBY_ENGINE}"
++rescue LoadError
++end
++
++##
++# Loads the default specs.
++Gem::Specification.load_defaults
++
++require_relative 'rubygems/core_ext/kernel_gem'
++require_relative 'rubygems/core_ext/kernel_require'
++require_relative 'rubygems/core_ext/kernel_warn'
+diff --git a/test/rubygems/test_rubygems.rb b/test/rubygems/test_rubygems.rb
+index 493b9fdf4a3..fa77a299322 100644
+--- a/test/rubygems/test_rubygems.rb
++++ b/test/rubygems/test_rubygems.rb
+@@ -22,6 +22,29 @@ def test_operating_system_other_exceptions
+     "the problem and ask for help."
+   end
+ 
++  def test_operating_system_customizing_default_dir
++    pend "does not apply to truffleruby" if RUBY_ENGINE == 'truffleruby'
++    pend "loads a custom defaults/jruby file that gets in the middle" if RUBY_ENGINE == 'jruby'
++
++    # On a non existing default dir, there should be no gems
++
++    path = util_install_operating_system_rb <<-RUBY
++      module Gem
++        def self.default_dir
++          File.expand_path("foo")
++        end
++      end
++    RUBY
++
++    output = Gem::Util.popen(
++      *ruby_with_rubygems_and_fake_operating_system_in_load_path(path),
++      '-e',
++      "require \"rubygems\"; puts Gem::Specification.stubs.map(&:full_name)",
++      {:err => [:child, :out]}
++    ).strip
++    assert_empty output
++  end
++
+   private
+ 
+   def util_install_operating_system_rb(content)
+
+From 52cfdd14fd1213a97aac12f01177e27779de9035 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
+Date: Thu, 9 Dec 2021 06:08:31 +0100
+Subject: [PATCH 4/5] Install default fiddle on latest ruby on specs that need
+ it
+
+Otherwise first OS customizations load and activate that fiddle version,
+but then when we change to `Gem.default_dir`, that fiddle version is no
+longer there.
+---
+ bundler/spec/commands/clean_spec.rb          | 2 +-
+ bundler/spec/install/gems/standalone_spec.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/spec/bundler/commands/clean_spec.rb b/spec/bundler/commands/clean_spec.rb
+index ffaf22dbb32..65231b35fac 100644
+--- a/spec/bundler/commands/clean_spec.rb
++++ b/spec/bundler/commands/clean_spec.rb
+@@ -638,7 +638,7 @@ def should_not_have_gems(*gems)
+       s.executables = "irb"
+     end
+ 
+-    realworld_system_gems "fiddle --version 1.0.6", "tsort --version 0.1.0", "pathname --version 0.1.0", "set --version 1.0.1"
++    realworld_system_gems "fiddle --version 1.0.8", "tsort --version 0.1.0", "pathname --version 0.1.0", "set --version 1.0.1"
+ 
+     install_gemfile <<-G
+       source "#{file_uri_for(gem_repo2)}"
+diff --git a/spec/bundler/install/gems/standalone_spec.rb b/spec/bundler/install/gems/standalone_spec.rb
+index db16a1b0e13..faefda25f45 100644
+--- a/spec/bundler/install/gems/standalone_spec.rb
++++ b/spec/bundler/install/gems/standalone_spec.rb
+@@ -113,7 +113,7 @@
+       skip "does not work on rubygems versions where `--install_dir` doesn't respect --default" unless Gem::Installer.for_spec(loaded_gemspec, :install_dir => "/foo").default_spec_file == "/foo/specifications/default/bundler-#{Bundler::VERSION}.gemspec" # Since rubygems 3.2.0.rc.2
+       skip "does not work on old rubies because the realworld gems that need to be installed don't support them" if RUBY_VERSION < "2.7.0"
+ 
+-      realworld_system_gems "fiddle --version 1.0.6", "tsort --version 0.1.0"
++      realworld_system_gems "fiddle --version 1.0.8", "tsort --version 0.1.0"
+ 
+       necessary_system_gems = ["optparse --version 0.1.1", "psych --version 3.3.2", "yaml --version 0.1.1", "logger --version 1.4.3", "etc --version 1.2.0", "stringio --version 3.0.0"]
+       necessary_system_gems += ["shellwords --version 0.1.0", "base64 --version 0.1.0", "resolv --version 0.2.1"] if Gem.rubygems_version < Gem::Version.new("3.3.3.a")
+
+From c6a9c81021092c9157f5616a2bbe1323411a5bf8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
+Date: Thu, 9 Dec 2021 12:46:23 +0100
+Subject: [PATCH 5/5] Resolve symlinks in LOAD_PATH when activating
+ pre-required default gems
+
+Some double load issues were reported a while ago by OS packagers where
+if a gem has been required before rubygems, and then after, rubygems
+require would cause a double load.
+
+We avoid this issue by activating the corresponding gem if we detect
+that a file in the default LOAD_PATH that belongs to a default gem has
+already been required when rubygems registers default gems.
+
+However, the fix does not take into account that the default LOAD_PATH
+could potentially include symlinks. This change fixes the same double
+load issue described above but for situations where the default
+LOAD_PATH includes symlinks.
+---
+ lib/rubygems.rb | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/rubygems.rb b/lib/rubygems.rb
+index 11474b6554c..b7dda38d522 100644
+--- a/lib/rubygems.rb
++++ b/lib/rubygems.rb
+@@ -1293,7 +1293,12 @@ def already_loaded?(file)
+     end
+ 
+     def default_gem_load_paths
+-      @default_gem_load_paths ||= $LOAD_PATH[load_path_insert_index..-1]
++      @default_gem_load_paths ||= $LOAD_PATH[load_path_insert_index..-1].map do |lp|
++        expanded = File.expand_path(lp)
++        next expanded unless File.exist?(expanded)
++
++        File.realpath(expanded)
++      end
+     end
+   end
+ 
diff --git a/rubygems.con b/rubygems.con
index bcdeddc..1a99ed0 100644
--- a/rubygems.con
+++ b/rubygems.con
@@ -19,7 +19,7 @@ module RubyGemsReq
   end
 
   # Report conflicting gem dependencies including their version.
-  def self.gem_dependencies(specification)
+  def self.gem_depenencies(specification)
     specification.runtime_dependencies.each do |dependency|
       conflict_strings = Helpers::requirement_versions_to_rpm(dependency.requirement).map do |requirement|
         requirement_string = "rubygem(#{dependency.name}) #{requirement}"
@@ -39,7 +39,7 @@ module RubyGemsReq
       begin
         specification = Gem::Specification.load filename
 
-        gem_dependencies(specification)
+        gem_depenencies(specification)
       rescue => e
         # Ignore all errors.
       end
diff --git a/rubygems.req b/rubygems.req
index 70aebd4..38e4a9c 100644
--- a/rubygems.req
+++ b/rubygems.req
@@ -58,7 +58,7 @@ module RubyGemsReq
   end
 
   # Report all gem dependencies including their version.
-  def self.gem_dependencies(specification)
+  def self.gem_depenencies(specification)
     specification.runtime_dependencies.each do |dependency|
       dependency_name = "rubygem(#{dependency.name})"
       requirements = Helpers::requirement_versions_to_rpm(dependency.requirement)
@@ -75,7 +75,7 @@ module RubyGemsReq
         specification = Gem::Specification.load filename
 
         rubygems_dependency(specification)
-        gem_dependencies(specification)
+        gem_depenencies(specification)
       rescue => e
         # Ignore all errors.
       end
diff --git a/sources b/sources
index f1f97eb..acb6fbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ruby-4.0.1.tar.xz) = b67d9d1f97ba30200d103f8454e39dc2d0450819d51d91eb5451d44b0bafc56d2fa48bb1be6c5081babe5828f679984bad02b9bcee7441f6bd34c0a95b8f200b
+SHA512 (ruby-3.0.4.tar.xz) = 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b
diff --git a/test_openssl_fips.rb b/test_openssl_fips.rb
deleted file mode 100644
index ffc7883..0000000
--- a/test_openssl_fips.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'openssl'
-
-# Run openssl tests in OpenSSL FIPS. See the link below for how to test.
-# https://github.com/ruby/openssl/blob/master/.github/workflows/test.yml
-# - step name: test on fips module
-
-# Listing the testing files by an array explicitly rather than the `Dir.glob`
-# to prevent the test files from not loading unintentionally.
-TEST_FILES = %w[
-  test/openssl/test_fips.rb
-  test/openssl/test_pkey.rb
-].freeze
-
-if ARGV.empty?
-  puts 'ERROR: Argument base_dir required.'
-  puts "Usage: #{__FILE__} base_dir [options]"
-  exit false
-end
-BASE_DIR = ARGV[0]
-abs_test_files = TEST_FILES.map { |file| File.join(BASE_DIR, file) }
-
-# Set Fedora/RHEL downstream OpenSSL downstream environment variable to enable
-# FIPS module in non-FIPS OS environment. It is available in Fedora 38 or later
-# versions.
-# https://src.fedoraproject.org/rpms/openssl/blob/rawhide/f/0009-Add-Kernel-FIPS-mode-flag-support.patch
-ENV['OPENSSL_FORCE_FIPS_MODE'] = '1'
-# A flag to tell the tests the current environment is FIPS enabled.
-# https://github.com/ruby/openssl/blob/master/test/openssl/test_fips.rb
-ENV['TEST_RUBY_OPENSSL_FIPS_ENABLED'] = 'true'
-
-abs_test_files.each do |file|
-  puts "INFO: Loading #{file}."
-  require file
-end
diff --git a/test_rubygems_con.rb b/test_rubygems_con.rb
deleted file mode 100644
index e124a49..0000000
--- a/test_rubygems_con.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-
-require 'test/unit'
-require 'rpm_test_helper'
-
-class TestRubyGemsCon < Test::Unit::TestCase
-  include RPMTestHelper
-
-  def test_filter_out_regular_requirements
-    gem_i = GemInfo.new
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(0, lines.size)
-
-    deps = [ Dependency.new('bar') ]
-    gem_i.dependencies = deps
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(0, lines.size)
-
-    deps = [
-      Dependency.new('bar'),
-      Dependency.new('baq'),
-      Dependency.new('quz')
-    ]
-
-    gem_i.dependencies = deps
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(0, lines.size)
-
-    deps = [
-      Dependency.new('bar', ['>= 4.1']),
-      Dependency.new('baz', ['~> 3.2']),
-      Dependency.new('quz', ['>= 5.6'])
-    ]
-
-    gem_i.dependencies = deps
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(0, lines.size)
-  end
-
-  def test_single_gem_single_version_conflict
-    con = Dependency.new('bar', ['!= 0.4.4'])
-
-    gem_i = GemInfo.new(dependencies: [ con ])
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-    assert_equal("#{con.to_rpm_str} = 0.4.4\n", lines.first)
-  end
-
-  def test_multiple_gems_with_single_conflict
-    cons = [
-      Dependency.new('bar', ['!= 1.1']),
-      Dependency.new('baq', ['!= 1.2.2']),
-      Dependency.new('quz', ['!= 1.3'])
-    ]
-
-    gem_i = GemInfo.new(dependencies: cons)
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(3, lines.size)
-
-    assert_equal("#{cons[0].to_rpm_str} = 1.1\n"  , lines[0])
-    assert_equal("#{cons[1].to_rpm_str} = 1.2.2\n", lines[1])
-    assert_equal("#{cons[2].to_rpm_str} = 1.3\n"  , lines[2])
-  end
-
-  def test_multiple_conflicts_on_single_gem
-    con = Dependency.new('bar', ['!= 2.3', '!= 2.4'])
-
-    gem_i = GemInfo.new(dependencies: [con])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-    rpm_name = con.to_rpm_str
-    left_rpm_constraint = "(#{rpm_name} = 2.3 with "
-    right_rpm_constraint = "#{rpm_name} = 2.4)\n"
-    assert_equal((left_rpm_constraint + right_rpm_constraint), lines[0])
-
-    con = Dependency.new('bar', ['!= 2.3', '!= 2.4', '!= 4.5'])
-
-    gem_i = GemInfo.new(dependencies: [ con ])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-
-    rpm_name = con.to_rpm_str
-    left_rpm_constraint = "(#{rpm_name} = 2.3 with "
-    middle_rpm_constraint = "#{rpm_name} = 2.4 with "
-    right_rpm_constraint = "#{rpm_name} = 4.5)\n"
-
-    assert_equal((left_rpm_constraint + middle_rpm_constraint + right_rpm_constraint), lines[0])
-  end
-
-  def test_generates_conflicts_while_ignoring_regular_requirements
-    deps = [
-      Dependency.new('bar', ['>= 2.3', '!= 2.4.2']),
-      Dependency.new('quz', ['~> 3.0', '!= 3.2'])
-    ]
-
-    gem_i = GemInfo.new(dependencies: deps)
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-
-    rpm_name = deps[0].to_rpm_str
-    rpm_constraint = "#{rpm_name} = 2.4.2\n"
-    assert_equal(rpm_constraint, lines[0])
-
-    rpm_name = deps[1].to_rpm_str
-    rpm_constraint = "#{rpm_name} = 3.2\n"
-    assert_equal(rpm_constraint, lines[1])
-  end
-end
diff --git a/test_rubygems_prov.rb b/test_rubygems_prov.rb
deleted file mode 100644
index b660ff6..0000000
--- a/test_rubygems_prov.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-require 'test/unit'
-require 'rpm_test_helper'
-
-class TestRubyGemsProv < Test::Unit::TestCase
-  include RPMTestHelper
-
-  def test_provides_the_gem_version
-    gem_i = GemInfo.new(version: '1.2')
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-    assert_equal("#{gem_i.to_rpm_str} = #{gem_i.version}\n", lines.first)
-
-    gem_i = GemInfo.new(name: 'somegem_foo', version: '4.5.6')
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-    assert_equal("#{gem_i.to_rpm_str} = #{gem_i.version}\n", lines.first)
-
-    deps = [
-      Dependency.new('bar'),
-      Dependency.new('baq', [">= 1.2"]),
-      Dependency.new('quz', ["!= 3.2"])
-    ]
-    gem_i = GemInfo.new(dependencies: deps)
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-    assert_equal("#{gem_i.to_rpm_str} = #{gem_i.version}\n", lines.first)
-  end
-
-  def test_translates_prelease_version_provides_from_rubygems_to_rpm
-    gem_i = GemInfo.new(version: '1.2.3.dev')
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-    assert_equal("#{gem_i.to_rpm_str} = 1.2.3~dev\n", lines.first)
-
-    gem_i = GemInfo.new(name: 'foo2', version: '1.2.3.dev.2')
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-    assert_equal("#{gem_i.to_rpm_str} = 1.2.3~dev.2\n", lines.first)
-  end
-end
diff --git a/test_rubygems_req.rb b/test_rubygems_req.rb
deleted file mode 100644
index 490923e..0000000
--- a/test_rubygems_req.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-# frozen_string_literal: true
-
-require 'test/unit'
-require 'rpm_test_helper'
-
-class TestRubyGemsReq < Test::Unit::TestCase
-  include RPMTestHelper
-
-  def test_depends_on_rubygems
-    gem_i = GemInfo.new
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(1, lines.size)
-    assert_equal("#{helper_rubygems_dependency}\n", lines.first)
-  end
-
-  def test_requires_rubygems_and_dependency
-    dep = Dependency.new('bar')
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-    assert_equal("#{helper_rubygems_dependency}\n", lines.first)
-    assert_equal("#{dep.to_rpm_str}\n", lines[1])
-  end
-
-  def test_requires_multiple_dependencies_with_constraint
-    constraints = [
-      '>= 3.0',
-      '>= 3.0.0',
-      '>= 3',
-      '= 1.0.2',
-      '= 3.0',
-      '< 3.2',
-      '<= 3.4'
-    ]
-
-    dependencies = []
-    constraints.each_with_index do |constraint, idx|
-      dependencies << Dependency.new("bar#{idx}", [constraint])
-    end
-
-    gem_i = GemInfo.new(dependencies: dependencies)
-
-    lines = run_generator_single_file(gem_i)
-    # + 1 for the rubygems dependency
-    assert_equal(constraints.size + 1, lines.size)
-    dependencies.each_with_index do |dep, idx|
-      rpm_dep_name = dep.to_rpm_str
-      # Start indexing lines at 1, to jump over rubygems dependency
-      assert_equal("#{rpm_dep_name} #{constraints[idx]}\n", lines[idx + 1])
-    end
-  end
-
-  def test_expands_pessimistic_constraint_for_rpm
-    dep = Dependency.new('bar', ['~> 1.2'])
-
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-
-    rpm_dep_name = dep.to_rpm_str
-    left_constraint = "#{rpm_dep_name} >= 1.2"
-    right_constraint = "#{rpm_dep_name} < 2"
-    expected_constraint = "(#{left_constraint} with #{right_constraint})\n"
-    assert_equal(expected_constraint, lines[1])
-  end
-
-  def test_multiple_pessimistically_constrained_dependencies
-    dependencies = []
-    dep_map = [
-      {
-        constraint:     '~> 1.2.3',
-        expanded_left:  '>= 1.2.3',
-        expanded_rigth: '< 1.3',
-        gem_name: 'bar1'
-      },
-      {
-        constraint:     '~> 1.2',
-        expanded_left:  '>= 1.2',
-        expanded_rigth: '< 2',
-        gem_name: 'bar2'
-      },
-      {
-        constraint:     '~> 3',
-        expanded_left:  '>= 3',
-        expanded_rigth: '< 4',
-        gem_name: 'bar3'
-      }
-    ].each do |deps|
-      dependencies << Dependency.new(deps[:gem_name], [deps[:constraint]])
-    end
-
-    gem_i = GemInfo.new(dependencies: dependencies)
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(dep_map.size + 1, lines.size)
-
-    dep_map.each_with_index do |hash, idx|
-      rpm_dep_name = dependencies[idx].to_rpm_str
-      left_constraint = rpm_dep_name + ' ' + hash[:expanded_left]
-      right_constraint = rpm_dep_name + ' ' + hash[:expanded_rigth]
-      expected_constraint = "(#{left_constraint} with #{right_constraint})\n"
-      assert_equal(expected_constraint, lines[idx + 1])
-    end
-  end
-
-  def test_multiple_constraints_on_one_dependency_composes_constraints_for_RPM
-    # The quoting here depends on how the constraint is expanded in the helpers.
-    # right now the form is `["#{constraint}"]`, therefore we have to not specify
-    # left and right quotes.
-    constraints = ['>= 0.2.3', '<= 0.2.5']
-    dep = Dependency.new('baz', constraints)
-
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-    rpm_dep_name = dep.to_rpm_str
-    assert_equal("(#{rpm_dep_name} >= 0.2.3 with #{rpm_dep_name} <= 0.2.5)\n", lines[1])
-
-    # Not sure who would compose a dependency like this, but it's possible
-    # to do with the current generator
-    constraints = ['> 0.4.5', '< 0.6.4', '>= 2.3', '<= 2.5.3']
-    dep = Dependency.new('qux', constraints)
-
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    rpm_dep = dep.to_rpm_str
-    expected_str = "(#{rpm_dep} > 0.4.5 with #{rpm_dep} < 0.6.4 with " \
-                   "#{rpm_dep} >= 2.3 with #{rpm_dep} <= 2.5.3)\n"
-
-    assert_equal(2, lines.size)
-    assert_equal(expected_str, lines[1])
-  end
-
-  # https://bugzilla.redhat.com/show_bug.cgi?id=1561487
-  def test_depends_on_gem_with_version_conflict
-    dep = Dependency.new('baz', ['!= 0.4'])
-
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-    assert_equal("#{dep.to_rpm_str}\n", lines[1])
-  end
-
-  def test_filters_conflict_from_regular_version_constraints
-    constraint = ['> 1.2.4', '!= 1.2.7']
-    dep = Dependency.new('baq', constraint)
-
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-    assert_equal("#{dep.to_rpm_str} > 1.2.4\n", lines[1])
-  end
-
-  def test_filtering_conflicts_is_not_depending_on_contraint_ordering
-    constraints = ['!= 1.2.7', '> 1.2.4']
-    dep = Dependency.new('baq', constraints)
-
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-    assert_equal("#{dep.to_rpm_str} > 1.2.4\n", lines[1])
-  end
-
-  def test_filters_multiple_conflicts_from_dependency
-    omit "Case not yet supported."
-    constraints = ['!= 1.2.4', '!= 1.2.5', '!= 2.3', '!= 4.8']
-    dep = Dependency.new('baf', constraints)
-
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-    assert_equal("#{dep.to_rpm_str}\n", lines[1])
-  end
-
-  def test_filters_multiple_conflicts_from_dependency_but_keeps_regular_constraint
-    constraints = ['!= 1.2.4', '!= 1.2.5', '!= 2.3', '<= 4.8']
-    dep = Dependency.new('bam', constraints)
-
-    gem_i = GemInfo.new(dependencies: [dep])
-
-    lines = run_generator_single_file(gem_i)
-
-    assert_equal(2, lines.size)
-    assert_equal("#{dep.to_rpm_str} <= 4.8\n", lines[1])
-  end
-end