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..f6e830f 100644
--- a/macros.rubygems
+++ b/macros.rubygems
@@ -2,41 +2,17 @@
 %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.
+# custom_gem_name is joined with %custom_gem_name_version macro which needs
+# to be predefined. Please note that for the version macros are the dashes
+# replaced by underscores.
 #
-%gem_name_version() %{?1}%{!?1:%{gem_name}}-%{gem_version %{?1}}
+%gem_name_version() %{?1}%{!?1:%{gem_name}}-%{?1:%{expand:%{%{gsub %{1} - _}_version}}}%{!?1:%{version}}%{?prerelease}
 
 # Common gem locations and files.
 #
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-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
index 8551d79..826d5f5 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}], [
+@@ -3470,6 +3470,11 @@ AS_IF([test ${multiarch+set}], [
  ])
  
  archlibdir='${libdir}/${arch}'
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..fb9b618 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"],
+@@ -4309,7 +4309,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,10 +63,10 @@ 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 @@
+@@ -115,7 +115,7 @@
      val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
      case name
      when /^prefix$/
diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch
index 6ecfb2e..a64b812 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
+@@ -4373,6 +4373,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
  
diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch
index 969fefa..91e53a1 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,
+@@ -4345,6 +4345,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
+@@ -4369,6 +4373,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)
+@@ -359,6 +359,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)
+@@ -595,7 +596,16 @@ def stub
  install?(:local, :comm, :lib) do
    prepare "library scripts", rubylibdir
    noinst = %w[*.txt *.rdoc *.gemspec]
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..c921c36 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.
@@ -17,10 +17,10 @@ string.
  2 files changed, 36 insertions(+), 31 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"],
+@@ -4259,9 +4259,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,
+@@ -4284,57 +4281,63 @@ AC_ARG_WITH(ridir,
  AC_SUBST(ridir)
  AC_SUBST(RI_BASE_NAME)
  
@@ -122,7 +122,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
+@@ -4351,6 +4354,7 @@ AC_SUBST(sitearchincludedir)dnl
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
@@ -131,7 +131,7 @@ 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@
@@ -143,20 +143,35 @@ index 6901ec2320..9b7b787208 100644
  RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
  arch=@arch@
 
-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)
+@@ -453,7 +453,7 @@ def CONFIG.[](name, mandatory = false)
  
  install?(:doc, :rdoc) do
    if $rdocdir
@@ -166,7 +181,7 @@ index 874c3ef1d9..a9e6365b27 100755
      install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
    end
 
-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.
@@ -177,7 +192,7 @@ Subject: [PATCH 3/4] Add ruby_version_dir_name support for RubyGems.
  2 files changed, 7 insertions(+), 5 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
@@ -209,10 +224,10 @@ index 90f09fc191..f6b8a03b95 100644
  
    ##
 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
+@@ -1351,7 +1351,8 @@ def test_self_use_paths
  
    def test_self_user_dir
      parts = [@userhome, ".gem", Gem.ruby_engine]
@@ -222,7 +237,7 @@ index 74c8953904..1f3bd91d51 100644
  
      FileUtils.mkdir_p File.join(parts)
  
-@@ -1415,7 +1416,7 @@ def test_self_vendor_dir
+@@ -1427,7 +1428,7 @@ def test_self_vendor_dir
      vendordir(File.join(@tempdir, "vendor")) do
        expected =
          File.join RbConfig::CONFIG["vendordir"], "gems",
@@ -232,7 +247,8 @@ index 74c8953904..1f3bd91d51 100644
        assert_equal expected, Gem.vendor_dir
      end
 
-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 +259,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"`
+@@ -135,7 +135,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)
diff --git a/ruby-2.7.0-Initialize-ABRT-hook.patch b/ruby-2.7.0-Initialize-ABRT-hook.patch
index 86d97fc..0f32243 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.
@@ -16,15 +16,15 @@ To keep the things simple for now, load the ABRT hook via C.
 [5]: https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/
 ---
  abrt.c                                | 12 ++++++++++++
- common.mk                             |  1 +
+ common.mk                             |  3 ++-
  ruby.c                                |  4 ++++
  spec/ruby/core/kernel/require_spec.rb |  2 ++
- 4 files changed, 19 insertions(+)
+ 4 files changed, 20 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 +41,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) \
+@@ -111,7 +111,8 @@ PRISM_FILES = prism/api_node.$(OBJEXT) \
+ 		prism/prism.$(OBJEXT) \
  		prism_init.$(OBJEXT)
  
- 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)
+@@ -1724,10 +1724,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
  
  void Init_builtin_features(void);
  
@@ -68,19 +70,19 @@ 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
+index 60c57d6259..1eec16f2c8 100644
 --- a/spec/ruby/core/kernel/require_spec.rb
 +++ b/spec/ruby/core/kernel/require_spec.rb
-@@ -26,6 +26,8 @@
+@@ -25,6 +25,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 -= %w[encdb transdb windows_1252]
      features.reject! { |feature| feature.end_with?('-fake') }
diff --git a/ruby-3.3.0-Disable-syntax-suggest-test-case.patch b/ruby-3.3.0-Disable-syntax-suggest-test-case.patch
index 09d11f9..1119a59 100644
--- a/ruby-3.3.0-Disable-syntax-suggest-test-case.patch
+++ b/ruby-3.3.0-Disable-syntax-suggest-test-case.patch
@@ -1,4 +1,4 @@
-From 9b7cb6a40d73bb86ee0de34360068e90e80f4e7e Mon Sep 17 00:00:00 2001
+From 6365d1b79e10330fced83d00d4cb950380a3b0fe 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.
@@ -9,12 +9,12 @@ This requires internet connection.
  1 file changed, 2 deletions(-)
 
 diff --git a/common.mk b/common.mk
-index dae7d9dc00..111e859d1b 100644
+index d55d1788aa..73755f6ccd 100644
 --- a/common.mk
 +++ b/common.mk
-@@ -1619,8 +1619,6 @@ no-test-bundled-gems-spec:
- 
- test-syntax-suggest:
+@@ -1601,8 +1601,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST)
+ 	$(ACTIONS_ENDGROUP)
+ no-test-syntax-suggest:
  
 -check: $(DOT_WAIT) $(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest
 -
diff --git a/ruby-3.3.0-Revert-Optimize-allocations-in-Hash-compare_by_identity.patch b/ruby-3.3.0-Revert-Optimize-allocations-in-Hash-compare_by_identity.patch
new file mode 100644
index 0000000..9baaf27
--- /dev/null
+++ b/ruby-3.3.0-Revert-Optimize-allocations-in-Hash-compare_by_identity.patch
@@ -0,0 +1,92 @@
+From 8944a064d0fd7947b8c2b6c761be3e3a0c9073af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Fri, 22 Dec 2023 14:16:48 +0100
+Subject: [PATCH 1/2] Revert "compare_by_identity: remove alloc for non-empty
+ Hash"
+
+This reverts commit 11fa76b1b521072c200c78ea023960221ff426d6.
+---
+ hash.c | 13 ++++---------
+ 1 file changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/hash.c b/hash.c
+index 78e9d9a2d6..f6525ba4a5 100644
+--- a/hash.c
++++ b/hash.c
+@@ -4377,16 +4377,13 @@ rb_hash_compare_by_id(VALUE hash)
+     if (hash_iterating_p(hash)) {
+         rb_raise(rb_eRuntimeError, "compare_by_identity during iteration");
+     }
++    ar_force_convert_table(hash, __FILE__, __LINE__);
++    HASH_ASSERT(RHASH_ST_TABLE_P(hash));
+ 
+     if (RHASH_TABLE_EMPTY_P(hash)) {
+         // Fast path: There's nothing to rehash, so we don't need a `tmp` table.
+-        // We're most likely an AR table, so this will need an allocation.
+-        ar_force_convert_table(hash, __FILE__, __LINE__);
+-        HASH_ASSERT(RHASH_ST_TABLE_P(hash));
+-
+         RHASH_ST_TABLE(hash)->type = &identhash;
+-    }
+-    else {
++    } else {
+         // Slow path: Need to rehash the members of `self` into a new
+         // `tmp` table using the new `identhash` compare/hash functions.
+         tmp = hash_alloc(0);
+@@ -4394,10 +4391,8 @@ rb_hash_compare_by_id(VALUE hash)
+         identtable = RHASH_ST_TABLE(tmp);
+ 
+         rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
+-        rb_hash_free(hash);
+ 
+-        // We know for sure `identtable` is an st table,
+-        // so we can skip `ar_force_convert_table` here.
++        rb_hash_free(hash);
+         RHASH_ST_TABLE_SET(hash, identtable);
+         RHASH_ST_CLEAR(tmp);
+     }
+
+From f5c415300ffe63e41e46c6b88b8634a3bad0c7c2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Fri, 22 Dec 2023 14:17:14 +0100
+Subject: [PATCH 2/2] Revert "compare_by_identity: remove alloc for empty Hash"
+
+This reverts commit b5c6c0122f5b010cb5f43e7a236c4ba2b1d56a2a.
+---
+ hash.c | 21 +++++++--------------
+ 1 file changed, 7 insertions(+), 14 deletions(-)
+
+diff --git a/hash.c b/hash.c
+index f6525ba4a5..cf83675c70 100644
+--- a/hash.c
++++ b/hash.c
+@@ -4380,22 +4380,15 @@ rb_hash_compare_by_id(VALUE hash)
+     ar_force_convert_table(hash, __FILE__, __LINE__);
+     HASH_ASSERT(RHASH_ST_TABLE_P(hash));
+ 
+-    if (RHASH_TABLE_EMPTY_P(hash)) {
+-        // Fast path: There's nothing to rehash, so we don't need a `tmp` table.
+-        RHASH_ST_TABLE(hash)->type = &identhash;
+-    } else {
+-        // Slow path: Need to rehash the members of `self` into a new
+-        // `tmp` table using the new `identhash` compare/hash functions.
+-        tmp = hash_alloc(0);
+-        hash_st_table_init(tmp, &identhash, RHASH_SIZE(hash));
+-        identtable = RHASH_ST_TABLE(tmp);
++    tmp = hash_alloc(0);
++    hash_st_table_init(tmp, &identhash, RHASH_SIZE(hash));
++    identtable = RHASH_ST_TABLE(tmp);
+ 
+-        rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
++    rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
+ 
+-        rb_hash_free(hash);
+-        RHASH_ST_TABLE_SET(hash, identtable);
+-        RHASH_ST_CLEAR(tmp);
+-    }
++    rb_hash_free(hash);
++    RHASH_ST_TABLE_SET(hash, identtable);
++    RHASH_ST_CLEAR(tmp);
+ 
+     return hash;
+ }
diff --git a/ruby-3.4.0-ruby-net-http-Renew-test-certificates.patch b/ruby-3.4.0-ruby-net-http-Renew-test-certificates.patch
new file mode 100644
index 0000000..34a18e0
--- /dev/null
+++ b/ruby-3.4.0-ruby-net-http-Renew-test-certificates.patch
@@ -0,0 +1,256 @@
+From d3933fc753187a055a4904af82f5f3794c88c416 Mon Sep 17 00:00:00 2001
+From: Sorah Fukumori <her@sorah.jp>
+Date: Mon, 1 Jan 2024 20:45:54 +0900
+Subject: [PATCH] [ruby/net-http] Renew test certificates
+
+The private key is replaced with a public known test key published at
+[RFC 9500].
+
+Also lifetime has been extended to 10 years from 4 years.
+
+[RFC 9500]: https://www.rfc-editor.org/rfc/rfc9500.html
+
+https://github.com/ruby/net-http/commit/4ab6c4a500
+---
+ test/net/fixtures/Makefile   |  6 +--
+ test/net/fixtures/cacert.pem | 44 ++++++++--------
+ test/net/fixtures/server.crt | 99 +++++++-----------------------------
+ test/net/fixtures/server.key | 55 ++++++++++----------
+ 4 files changed, 71 insertions(+), 133 deletions(-)
+
+diff --git a/test/net/fixtures/Makefile b/test/net/fixtures/Makefile
+index b2bc9c7368ee2..88c232e3b6c16 100644
+--- a/test/net/fixtures/Makefile
++++ b/test/net/fixtures/Makefile
+@@ -5,11 +5,11 @@ regen_certs:
+ 	make server.crt
+ 
+ cacert.pem: server.key
+-	openssl req -new -x509 -days 1825 -key server.key -out cacert.pem -text -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org"
++	openssl req -new -x509 -days 3650 -key server.key -out cacert.pem -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org"
+ 
+ server.csr:
+-	openssl req -new -key server.key -out server.csr -text -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost"
++	openssl req -new -key server.key -out server.csr -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost"
+ 
+ server.crt: server.csr cacert.pem
+-	openssl x509 -days 1825 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -text -out server.crt
++	openssl x509 -days 3650 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -out server.crt
+ 	rm server.csr
+diff --git a/test/net/fixtures/cacert.pem b/test/net/fixtures/cacert.pem
+index f623bd62ed375..24c83f1c65225 100644
+--- a/test/net/fixtures/cacert.pem
++++ b/test/net/fixtures/cacert.pem
+@@ -1,24 +1,24 @@
+ -----BEGIN CERTIFICATE-----
+-MIID7TCCAtWgAwIBAgIJAIltvxrFAuSnMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
+-VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx
+-FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex
+-JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTkwMTAy
+-MDI1ODI4WhcNMjQwMTAxMDI1ODI4WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM
+-B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv
+-cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
+-ZWN1cml0eUBydWJ5LWxhbmcub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+-CgKCAQEAznlbjRVhz1NlutHVrhcGnK8W0qug2ujKXv1njSC4U6nJF6py7I9EeehV
+-SaKePyv+I9z3K1LnfUHOtUbdwdKC77yN66A6q2aqzu5q09/NSykcZGOIF0GuItYI
+-3nvW3IqBddff2ffsyR+9pBjfb5AIPP08WowF9q4s1eGULwZc4w2B8PFhtxYANd7d
+-BvGLXFlcufv9tDtzyRi4t7eqxCRJkZQIZNZ6DHHIJrNxejOILfHLarI12yk8VK6L
+-2LG4WgGqyeePiRyd1o1MbuiAFYqAwpXNUbRKg5NaZGwBHZk8UZ+uFKt1QMBURO5R
+-WFy1c349jbWszTqFyL4Lnbg9HhAowQIDAQABo1AwTjAdBgNVHQ4EFgQU9tEiKdU9
+-I9derQyc5nWPnc34nVMwHwYDVR0jBBgwFoAU9tEiKdU9I9derQyc5nWPnc34nVMw
+-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAxj7F/u3C3fgq24N7hGRA
+-of7ClFQxGmo/IGT0AISzW3HiVYiFaikKhbO1NwD9aBpD8Zwe62sCqMh8jGV/b0+q
+-aOORnWYNy2R6r9FkASAglmdF6xn3bhgGD5ls4pCvcG9FynGnGc24g6MrjFNrBYUS
+-2iIZsg36i0IJswo/Dy6HLphCms2BMCD3DeWtfjePUiTmQHJo6HsQIKP/u4N4Fvee
+-uMBInei2M4VU74fLXbmKl1F9AEX7JDP3BKSZG19Ch5pnUo4uXM1uNTGsi07P4Y0s
+-K44+SKBC0bYEFbDK0eQWMrX3kIhkPxyIWhxdq9/NqPYjShuSEAhA6CSpmRg0pqc+
+-mA==
++MIID+zCCAuOgAwIBAgIUGMvHl3EhtKPKcgc3NQSAYfFuC+8wDQYJKoZIhvcNAQEL
++BQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRQwEgYDVQQHDAtN
++YXR6LWUgY2l0eTEXMBUGA1UECgwOUnVieSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1
++YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJARYWc2VjdXJpdHlAcnVieS1sYW5nLm9y
++ZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEyMjkxMTQ3MjNaMIGMMQswCQYDVQQGEwJK
++UDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkxFzAVBgNV
++BAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0ExJTAjBgkq
++hkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqGSIb3DQEB
++AQUAA4IBDwAwggEKAoIBAQCw+egZQ6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI
+++1GSqyi1bFBgsRjM0THllIdMbKmJtWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0f
++qXmG8UTz0VTWdlAXXmhUs6lSADvAaIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0
++yg+801SXzoFTTa+UGIRLE66jH51aa5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIe
++NWMF32wHqIOOPvQcWV3M5D2vxJEj702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1
++JNPc/n3dVUm+fM6NoDXPoLP7j55G9zKyqGtGAWXAj1MTAgMBAAGjUzBRMB0GA1Ud
++DgQWBBSJGVleDvFp9cu9R+E0/OKYzGkwkTAfBgNVHSMEGDAWgBSJGVleDvFp9cu9
++R+E0/OKYzGkwkTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBl
++8GLB8skAWlkSw/FwbUmEV3zyqu+p7PNP5YIYoZs0D74e7yVulGQ6PKMZH5hrZmHo
++orFSQU+VUUirG8nDGj7Rzce8WeWBxsaDGC8CE2dq6nC6LuUwtbdMnBrH0LRWAz48
++jGFF3jHtVz8VsGfoZTZCjukWqNXvU6hETT9GsfU+PZqbqcTVRPH52+XgYayKdIbD
++r97RM4X3+aXBHcUW0b76eyyi65RR/Xtvn8ioZt2AdX7T2tZzJyXJN3Hupp77s6Ui
++AZR35SToHCZeTZD12YBvLBdaTPLZN7O/Q/aAO9ZiJaZ7SbFOjz813B2hxXab4Fob
++2uJX6eMWTVxYK5D4M9lm
+ -----END CERTIFICATE-----
+diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt
+index 5ca78a6d146a0..5d2923795dabc 100644
+--- a/test/net/fixtures/server.crt
++++ b/test/net/fixtures/server.crt
+@@ -1,82 +1,21 @@
+-Certificate:
+-    Data:
+-        Version: 3 (0x2)
+-        Serial Number: 2 (0x2)
+-    Signature Algorithm: sha256WithRSAEncryption
+-        Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
+-        Validity
+-            Not Before: Jan  2 03:27:13 2019 GMT
+-            Not After : Jan  1 03:27:13 2024 GMT
+-        Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost
+-        Subject Public Key Info:
+-            Public Key Algorithm: rsaEncryption
+-                Public-Key: (2048 bit)
+-                Modulus:
+-                    00:e8:da:9c:01:2e:2b:10:ec:49:cd:5e:07:13:07:
+-                    9c:70:9e:c6:74:bc:13:c2:e1:6f:c6:82:fd:e3:48:
+-                    e0:2c:a5:68:c7:9e:42:de:60:54:65:e6:6a:14:57:
+-                    7a:30:d0:cc:b5:b6:d9:c3:d2:df:c9:25:97:54:67:
+-                    cf:f6:be:5e:cb:8b:ee:03:c5:e1:e2:f9:e7:f7:d1:
+-                    0c:47:f0:b8:da:33:5a:ad:41:ad:e7:b5:a2:7b:b7:
+-                    bf:30:da:60:f8:e3:54:a2:bc:3a:fd:1b:74:d9:dc:
+-                    74:42:e9:29:be:df:ac:b4:4f:eb:32:f4:06:f1:e1:
+-                    8c:4b:a8:8b:fb:29:e7:b1:bf:1d:01:ee:73:0f:f9:
+-                    40:dc:d5:15:79:d9:c6:73:d0:c0:dd:cb:e4:da:19:
+-                    47:80:c6:14:04:72:fd:9a:7c:8f:11:82:76:49:04:
+-                    79:cc:f2:5c:31:22:95:13:3e:5d:40:a6:4d:e0:a3:
+-                    02:26:7d:52:3b:bb:ed:65:a1:0f:ed:6b:b0:3c:d4:
+-                    de:61:15:5e:d3:dd:68:09:9f:4a:57:a5:c2:a9:6d:
+-                    86:92:c5:f4:a4:d4:b7:13:3b:52:63:24:05:e2:cc:
+-                    e3:8a:3c:d4:35:34:2b:10:bb:58:72:e7:e1:8d:1d:
+-                    74:8c:61:16:20:3d:d0:1c:4e:8f:6e:fd:fe:64:10:
+-                    4f:41
+-                Exponent: 65537 (0x10001)
+-        X509v3 extensions:
+-            X509v3 Basic Constraints: 
+-                CA:FALSE
+-            Netscape Comment: 
+-                OpenSSL Generated Certificate
+-            X509v3 Subject Key Identifier: 
+-                ED:28:C2:7E:AB:4B:C8:E8:FE:55:6D:66:95:31:1C:2D:60:F9:02:36
+-            X509v3 Authority Key Identifier: 
+-                keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53
+-
+-    Signature Algorithm: sha256WithRSAEncryption
+-         1d:b8:c5:8b:72:41:20:65:ad:27:6f:15:63:06:26:12:8d:9c:
+-         ad:ca:f4:db:97:b4:90:cb:ff:35:94:bb:2a:a7:a1:ab:1e:35:
+-         2d:a5:3f:c9:24:b0:1a:58:89:75:3e:81:0a:2c:4f:98:f9:51:
+-         fb:c0:a3:09:d0:0a:9b:e7:a2:b7:c3:60:40:c8:f4:6d:b2:6a:
+-         56:12:17:4c:00:24:31:df:9c:60:ae:b1:68:54:a9:e6:b5:4a:
+-         04:e6:92:05:86:d9:5a:dc:96:30:a5:58:de:14:99:0f:e5:15:
+-         89:3e:9b:eb:80:e3:bd:83:c3:ea:33:35:4b:3e:2f:d3:0d:64:
+-         93:67:7f:8d:f5:3f:0c:27:bc:37:5a:cc:d6:47:16:af:5a:62:
+-         d2:da:51:f8:74:06:6b:24:ad:28:68:08:98:37:7d:ed:0e:ab:
+-         1e:82:61:05:d0:ba:75:a0:ab:21:b0:9a:fd:2b:54:86:1d:0d:
+-         1f:c2:d4:77:1f:72:26:5e:ad:8a:9f:09:36:6d:44:be:74:c2:
+-         5a:3e:ff:5c:9d:75:d6:38:7b:c5:39:f9:44:6e:a1:d1:8e:ff:
+-         63:db:c4:bb:c6:91:92:ca:5c:60:9b:1d:eb:0a:de:08:ee:bf:
+-         da:76:03:65:62:29:8b:f8:7f:c7:86:73:1e:f6:1f:2d:89:69:
+-         fd:be:bd:6e
+ -----BEGIN CERTIFICATE-----
+-MIID4zCCAsugAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx
+-EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK
+-DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI
+-hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMjcxM1oX
+-DTI0MDEwMTAzMjcxM1owYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx
+-FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ
+-BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+-AOjanAEuKxDsSc1eBxMHnHCexnS8E8Lhb8aC/eNI4CylaMeeQt5gVGXmahRXejDQ
+-zLW22cPS38kll1Rnz/a+XsuL7gPF4eL55/fRDEfwuNozWq1Bree1onu3vzDaYPjj
+-VKK8Ov0bdNncdELpKb7frLRP6zL0BvHhjEuoi/sp57G/HQHucw/5QNzVFXnZxnPQ
+-wN3L5NoZR4DGFARy/Zp8jxGCdkkEeczyXDEilRM+XUCmTeCjAiZ9Uju77WWhD+1r
+-sDzU3mEVXtPdaAmfSlelwqlthpLF9KTUtxM7UmMkBeLM44o81DU0KxC7WHLn4Y0d
+-dIxhFiA90BxOj279/mQQT0ECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhC
+-AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFO0o
+-wn6rS8jo/lVtZpUxHC1g+QI2MB8GA1UdIwQYMBaAFPbRIinVPSPXXq0MnOZ1j53N
+-+J1TMA0GCSqGSIb3DQEBCwUAA4IBAQAduMWLckEgZa0nbxVjBiYSjZytyvTbl7SQ
+-y/81lLsqp6GrHjUtpT/JJLAaWIl1PoEKLE+Y+VH7wKMJ0Aqb56K3w2BAyPRtsmpW
+-EhdMACQx35xgrrFoVKnmtUoE5pIFhtla3JYwpVjeFJkP5RWJPpvrgOO9g8PqMzVL
+-Pi/TDWSTZ3+N9T8MJ7w3WszWRxavWmLS2lH4dAZrJK0oaAiYN33tDqsegmEF0Lp1
+-oKshsJr9K1SGHQ0fwtR3H3ImXq2Knwk2bUS+dMJaPv9cnXXWOHvFOflEbqHRjv9j
+-28S7xpGSylxgmx3rCt4I7r/adgNlYimL+H/HhnMe9h8tiWn9vr1u
++MIIDYTCCAkkCAQAwDQYJKoZIhvcNAQELBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD
++VQQIDAdTaGltYW5lMRQwEgYDVQQHDAtNYXR6LWUgY2l0eTEXMBUGA1UECgwOUnVi
++eSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ
++ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEy
++MjkxMTQ3MjNaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRcwFQYD
++VQQKDA5SdWJ5IENvcmUgVGVhbTESMBAGA1UECwwJUnVieSBUZXN0MRIwEAYDVQQD
++DAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+egZ
++Q6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI+1GSqyi1bFBgsRjM0THllIdMbKmJ
++tWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0fqXmG8UTz0VTWdlAXXmhUs6lSADvA
++aIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0yg+801SXzoFTTa+UGIRLE66jH51a
++a5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIeNWMF32wHqIOOPvQcWV3M5D2vxJEj
++702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1JNPc/n3dVUm+fM6NoDXPoLP7j55G
++9zKyqGtGAWXAj1MTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACtGNdj5TEtnJBYp
++M+LhBeU3oNteldfycEm993gJp6ghWZFg23oX8fVmyEeJr/3Ca9bAgDqg0t9a0npN
++oWKEY6wVKqcHgu3gSvThF5c9KhGbeDDmlTSVVNQmXWX0K2d4lS2cwZHH8mCm2mrY
++PDqlEkSc7k4qSiqigdS8i80Yk+lDXWsm8CjsiC93qaRM7DnS0WPQR0c16S95oM6G
++VklFKUSDAuFjw9aVWA/nahOucjn0w5fVW6lyIlkBslC1ChlaDgJmvhz+Ol3iMsE0
++kAmFNu2KKPVrpMWaBID49QwQTDyhetNLaVVFM88iUdA9JDoVMEuP1mm39JqyzHTu
++uBrdP4Q=
+ -----END CERTIFICATE-----
+diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key
+index 7f2380e71e637..6a83d5bcf4a52 100644
+--- a/test/net/fixtures/server.key
++++ b/test/net/fixtures/server.key
+@@ -1,28 +1,27 @@
+------BEGIN PRIVATE KEY-----
+-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDo2pwBLisQ7EnN
+-XgcTB5xwnsZ0vBPC4W/Ggv3jSOAspWjHnkLeYFRl5moUV3ow0My1ttnD0t/JJZdU
+-Z8/2vl7Li+4DxeHi+ef30QxH8LjaM1qtQa3ntaJ7t78w2mD441SivDr9G3TZ3HRC
+-6Sm+36y0T+sy9Abx4YxLqIv7Keexvx0B7nMP+UDc1RV52cZz0MDdy+TaGUeAxhQE
+-cv2afI8RgnZJBHnM8lwxIpUTPl1Apk3gowImfVI7u+1loQ/ta7A81N5hFV7T3WgJ
+-n0pXpcKpbYaSxfSk1LcTO1JjJAXizOOKPNQ1NCsQu1hy5+GNHXSMYRYgPdAcTo9u
+-/f5kEE9BAgMBAAECggEBAOHkwhc7DLh8IhTDNSW26oMu5OP2WU1jmiYAigDmf+OQ
+-DBgrZj+JQBci8qINQxL8XLukSZn5hvQCLc7Kbyu1/wyEEUFDxSGGwwzclodr9kho
+-LX2LDASPZrOSzD2+fPi2wTKmXKuS6Uc44OjQfZkYMNkz9r4Vkm8xGgOD3VipjIYX
+-QXlhhdqkXZcNABsihCV52GKkDFSVm8jv95YJc5xhoYCy/3a4/qPdF0aT2R7oYUej
+-hKrxVDskyooe8Zg/JTydZNV5GQEDmW01/K3r6XGT26oPi1AqMU1gtv/jkW56CRQQ
+-1got8smnqM+AV7Slf9R6DauIPdQJ2S8wsr/o8ISBsOECgYEA9YrqEP2gAYSGFXRt
+-liw0WI2Ant8BqXS6yvq1jLo/qWhLw/ph4Di73OQ2mpycVTpgfGr2wFPQR1XJ+0Fd
+-U+Ir/C3Q7FK4VIGHK7B0zNvZr5tEjlFfeRezo2JMVw5YWeSagIFcSwK+KqCTH9qc
+-pw/Eb8nB/4XNcpTZu7Fg0Wc+ooUCgYEA8sVaicn1Wxkpb45a4qfrA6wOr5xdJ4cC
+-A5qs7vjX2OdPIQOmoQhdI7bCWFXZzF33wA4YCws6j5wRaySLIJqdms8Gl9QnODy1
+-ZlA5gwKToBC/jqPmWAXSKb8EH7cHilaxU9OKnQ7CfwlGLHqjMtjrhR7KHlt3CVRs
+-oRmvsjZVXI0CgYAmPedslAO6mMhFSSfULrhMXmV82OCqYrrA6EEkVNGbcdnzAOkD
+-gfKIWabDd8bFY10po4Mguy0CHzNhBXIioWQWV5BlbhC1YKMLw+S9DzSdLAKGY9gJ
+-xQ4+UQ3wtRQ/k+IYR413RUsW2oFvgZ3KSyNeAb9MK6uuv84VdG/OzVSs/QKBgQDn
+-kap//l2EbObiWyaERunckdVcW0lcN+KK75J/TGwPoOwQsLvTpPe65kxRGGrtDsEQ
+-uCDk/+v3KkZPLgdrrTAih9FhJ+PVN8tMcb+6IM4SA4fFFr/UPJEwct0LJ3oQ0grJ
+-y+HPWFHb/Uurh7t99/4H98uR02sjQh1wOeEmm78mzQKBgQDm+LzGH0se6CXQ6cdZ
+-g1JRZeXkDEsrW3hfAsW62xJQmXcWxBoblP9OamMY+A06rM5og3JbDk5Zm6JsOaA8
+-wS2gw4ilp46jors4eQey8ux7kB9LzdBoDBBElnsbjLO8oBNZlVcYXg+6BOl/CUi7
+-2whRF0FEjKA8ehrNhAq+VFfFNw==
+------END PRIVATE KEY-----
++-----BEGIN RSA PRIVATE KEY-----
++MIIEowIBAAKCAQEAsPnoGUOnrpiSqt4XynxA+HRP7S+BSObI6qJ7fQAVSPtRkqso
++tWxQYLEYzNEx5ZSHTGypibVsJylvCfuToDTfMul8b/CZjP2Ob0LdpYrNH6l5hvFE
++89FU1nZQF15oVLOpUgA7wGiHuEVawrGfey92UE68mOyUVXGweJIVDdxqdMoPvNNU
++l86BU02vlBiESxOuox+dWmuVV7vfYZ79Toh/LUK43YvJh+rhv4nKuF7iHjVjBd9s
++B6iDjj70HFldzOQ9r8SRI+9NirupPTkF5AKNe6kUhKJ1luB7S27ZkvB3tSTT3P59
++3VVJvnzOjaA1z6Cz+4+eRvcysqhrRgFlwI9TEwIDAQABAoIBAEEYiyDP29vCzx/+
++dS3LqnI5BjUuJhXUnc6AWX/PCgVAO+8A+gZRgvct7PtZb0sM6P9ZcLrweomlGezI
++FrL0/6xQaa8bBr/ve/a8155OgcjFo6fZEw3Dz7ra5fbSiPmu4/b/kvrg+Br1l77J
++aun6uUAs1f5B9wW+vbR7tzbT/mxaUeDiBzKpe15GwcvbJtdIVMa2YErtRjc1/5B2
++BGVXyvlJv0SIlcIEMsHgnAFOp1ZgQ08aDzvilLq8XVMOahAhP1O2A3X8hKdXPyrx
++IVWE9bS9ptTo+eF6eNl+d7htpKGEZHUxinoQpWEBTv+iOoHsVunkEJ3vjLP3lyI/
++fY0NQ1ECgYEA3RBXAjgvIys2gfU3keImF8e/TprLge1I2vbWmV2j6rZCg5r/AS0u
++pii5CvJ5/T5vfJPNgPBy8B/yRDs+6PJO1GmnlhOkG9JAIPkv0RBZvR0PMBtbp6nT
++Y3yo1lwamBVBfY6rc0sLTzosZh2aGoLzrHNMQFMGaauORzBFpY5lU50CgYEAzPHl
++u5DI6Xgep1vr8QvCUuEesCOgJg8Yh1UqVoY/SmQh6MYAv1I9bLGwrb3WW/7kqIoD
++fj0aQV5buVZI2loMomtU9KY5SFIsPV+JuUpy7/+VE01ZQM5FdY8wiYCQiVZYju9X
++Wz5LxMNoz+gT7pwlLCsC4N+R8aoBk404aF1gum8CgYAJ7VTq7Zj4TFV7Soa/T1eE
++k9y8a+kdoYk3BASpCHJ29M5R2KEA7YV9wrBklHTz8VzSTFTbKHEQ5W5csAhoL5Fo
++qoHzFFi3Qx7MHESQb9qHyolHEMNx6QdsHUn7rlEnaTTyrXh3ifQtD6C0yTmFXUIS
++CW9wKApOrnyKJ9nI0HcuZQKBgQCMtoV6e9VGX4AEfpuHvAAnMYQFgeBiYTkBKltQ
++XwozhH63uMMomUmtSG87Sz1TmrXadjAhy8gsG6I0pWaN7QgBuFnzQ/HOkwTm+qKw
++AsrZt4zeXNwsH7QXHEJCFnCmqw9QzEoZTrNtHJHpNboBuVnYcoueZEJrP8OnUG3r
++UjmopwKBgAqB2KYYMUqAOvYcBnEfLDmyZv9BTVNHbR2lKkMYqv5LlvDaBxVfilE0
++2riO4p6BaAdvzXjKeRrGNEKoHNBpOSfYCOM16NjL8hIZB1CaV3WbT5oY+jp7Mzd5
++7d56RZOE+ERK2uz/7JX9VSsM/LbH9pJibd4e8mikDS9ntciqOH/3
++-----END RSA PRIVATE KEY-----
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.rpmlintrc b/ruby.rpmlintrc
index ec8ac11..90e14d6 100644
--- a/ruby.rpmlintrc
+++ b/ruby.rpmlintrc
@@ -13,13 +13,15 @@ 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 ')
+# https://github.com/ruby/debug/pull/481
+# https://github.com/ruby/net-ftp/pull/12
+# https://github.com/ruby/net-imap/pull/53
+# https://github.com/ruby/net-pop/pull/7
+# https://github.com/ruby/prime/pull/16
+addFilter(r'^.*: E: non-executable-script /usr/share/gems/gems/(debug|net-(ftp|imap|pop)|prime)-[\d\.]+/bin/\w+ 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$')
diff --git a/ruby.spec b/ruby.spec
index a364fe6..3307d6b 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,31 +1,24 @@
-%global major_version 4
-%global minor_version 0
-%global teeny_version 1
+%global major_version 3
+%global minor_version 3
+%global teeny_version 0
 %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 5124f9ac75
 
 %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 ~%{ruby_archive_timestamp}%{?milestone}%{?!milestone:%{?revision:git%{revision}}}
 %endif
 
 
@@ -33,123 +26,116 @@
 # 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_version 3.5.3
 %global rubygems_molinillo_version 0.8.0
-%global rubygems_net_http_version 0.7.0
+%global rubygems_net_http_version 0.4.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_optparse_version 0.4.0
+%global rubygems_resolv_version 0.3.0
+%global rubygems_timeout_version 0.4.1
 %global rubygems_tsort_version 0.2.0
-%global rubygems_uri_version 1.1.1
 
 # 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_version 2.5.3
+%global bundler_connection_pool_version 2.4.1
+%global bundler_fileutils_version 1.7.2
+%global bundler_net_http_persistent_version 4.0.2
 %global bundler_pub_grub_version 0.5.0
-%global bundler_securerandom_version 0.4.1
-%global bundler_thor_version 1.4.0
+%global bundler_thor_version 1.3.0
 %global bundler_tsort_version 0.2.0
-%global bundler_uri_version 1.1.1
+%global bundler_uri_version 0.13.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 abbrev_version 0.1.2
+%global base64_version 0.2.0
+%global benchmark_version 0.3.0
+%global cgi_version 0.4.1
+%global csv_version 3.2.8
+%global date_version 3.3.4
+%global delegate_version 0.3.1
+%global did_you_mean_version 1.6.3
+%global digest_version 3.1.1
+%global drb_version 2.2.0
+%global english_version 0.8.0
+%global erb_version 4.0.3
+%global error_highlight_version 0.6.0
+%global etc_version 1.4.3
+%global fcntl_version 1.1.0
+%global fiddle_version 1.1.2
+%global fileutils_version 1.7.2
 %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 forwardable_version 1.3.3
+%global getoptlong_version 0.2.1
+%global io_nonblock_version 0.3.0
+%global io_wait_version 0.3.1
+%global ipaddr_version 1.2.6
+%global logger_version 1.6.0
+%global mutex_m_version 0.2.0
+%global net_http_version 0.4.0
 %global net_protocol_version 0.2.2
-%global open_uri_version 0.5.0
+%global nkf_version 0.1.3
+%global observer_version 0.1.2
 %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 openssl_version 3.2.0
+%global open_uri_version 0.4.1
+%global optparse_version 0.4.0
+%global ostruct_version 0.6.0
+%global pathname_version 0.3.0
+%global pp_version 0.5.0
 %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 pstore_version 0.1.3
+%global readline_version 0.0.4
+%global reline_version 0.4.1
+%global resolv_version 0.3.0
+%global resolv_replace_version 0.1.1
+%global rinda_version 0.2.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 securerandom_version 0.3.1
+%global set_version 1.1.0
+%global shellwords_version 0.2.0
+%global singleton_version 0.2.0
+%global stringio_version 3.1.0
+%global strscan_version 3.0.7
+%global syntax_suggest_version 2.0.0
+%global syslog_version 0.1.2
+%global tempfile_version 0.2.1
+%global time_version 0.3.0
+%global timeout_version 0.4.1
+%global tmpdir_version 0.2.0
 %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 uri_version 0.13.0
+%global weakref_version 0.1.3
+%global win32ole_version 1.8.10
+%global yaml_version 0.3.0
+%global prism_version 0.19.0
+%global zlib_version 3.1.0
+
+# Gemified default gems.
+%global bigdecimal_version 3.1.5
+%global io_console_version 0.7.1
+%global irb_version 1.11.0
+%global json_version 2.7.1
+%global psych_version 5.1.2
+%global rdoc_version 6.6.2
 
 # 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 debug_version 1.9.1
+%global net_ftp_version 0.3.3
+%global net_imap_version 0.4.9
 %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 net_smtp_version 0.4.0
+%global matrix_version 0.4.2
+%global minitest_version 5.20.0
+%global power_assert_version 2.0.3
+%global prime_version 0.1.2
+%global racc_version 1.7.3
+%global rake_version 13.1.0
+%global rbs_version 3.4.0
+%global rexml_version 3.2.6
+%global rss_version 0.3.0
+%global test_unit_version 3.6.1
+%global typeprof_version 0.21.9
 
 %global tapset_libdir %(echo %{_libdir} | sed 's/64//')*
 
@@ -162,22 +148,13 @@
 %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
+# YJIT is supported on x86_64 and aarch64.
+# https://github.com/ruby/ruby/blob/master/doc/yjit/yjit.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
@@ -190,40 +167,14 @@
 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
+Release: 1%{?dist}
+# BSD-3-Clause: missing/{crypt,mt19937,setproctitle}.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
+# 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
+# Unicode-DFS-2015: some of enc/trans/**/*.src
+License: (Ruby OR BSD-2-Clause) AND BSD-3-Clause AND ISC AND Public Domain AND MIT and CC0 AND zlib AND Unicode-DFS-2015
 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 +184,42 @@ 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
+Source14: 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
+Source15: test_openssl_fips.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$
+%global __local_generator_requires make -C %{_builddir}/%{buildsubdir}/%{_vpath_builddir} -s runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE9}"
+%global __local_generator_provides make -C %{_builddir}/%{buildsubdir}/%{_vpath_builddir} -s runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE10}"
+%global __local_generator_conflicts make -C %{_builddir}/%{buildsubdir}/%{_vpath_builddir} -s runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE11}"
+%global __local_generator_path ^%{gem_dir}/specifications/.*\.gemspec$
 
 # 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
 # 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
@@ -291,44 +231,32 @@ Patch5: ruby-2.1.0-custom-rubygems-location.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
+Patch9: ruby-3.3.0-Disable-syntax-suggest-test-case.patch
+# Revert patches causing segfaults in alexandria package.
+# https://bugs.ruby-lang.org/issues/20079
+Patch10: ruby-3.3.0-Revert-Optimize-allocations-in-Hash-compare_by_identity.patch
+# Fix net-http test errors due to expired certificate
+# https://github.com/ruby/ruby/commit/d3933fc753187a055a4904af82f5f3794c88c416
+# https://bugs.ruby-lang.org/issues/20106
+Patch11: ruby-3.4.0-ruby-net-http-Renew-test-certificates.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?with_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}
 
+BuildRequires: rpm-local-generator-support
 # Build dependencies
 BuildRequires: autoconf
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: libffi-devel
-BuildRequires: libxcrypt-devel
 BuildRequires: libyaml-devel
 BuildRequires: openssl-devel
 BuildRequires: zlib-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
+%{?with_yjit:BuildRequires: %{_bindir}/rustc}
 
 # Install section
 BuildRequires: multilib-rpm-config
@@ -392,6 +320,15 @@ Provides: bundled(ccan-list)
 Provides: bundled(rubygem-did_you_mean) = %{did_you_mean_version}
 Provides: bundled(rubygem-openssl) = %{openssl_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
 This package includes the libruby, necessary to run Ruby.
@@ -409,13 +346,12 @@ Version:    %{rubygems_version}
 #   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) AND BSD-2-Clause AND (BSD-2-Clause OR Ruby) AND 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}}
+Requires:   rubygem(psych) >= %{psych_version}
 Provides:   gem = %{version}-%{release}
 Provides:   ruby(rubygems) = %{version}-%{release}
 Provides:   bundled(rubygems) = %{rubygems_version}
@@ -425,10 +361,8 @@ 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
 
@@ -459,6 +393,8 @@ Macros and development tools for packaging RubyGems.
 %package default-gems
 Summary:    Default gems which are part of Ruby StdLib
 Supplements: ruby(rubygems)
+# Obsoleted by Ruby 2.7 in F32 timeframe.
+Obsoletes: rubygem-did_you_mean < 1.4.0-130
 # Obsoleted by Ruby 3.0 in F34 timeframe.
 Obsoletes: rubygem-openssl < 2.2.0-145
 BuildArch:  noarch
@@ -474,6 +410,10 @@ Version:    %{irb_version}
 License:    Ruby OR BSD-2-Clause
 Provides:   irb = %{version}-%{release}
 Provides:   bundled(rubygem-irb) = %{irb_version}
+# Obsoleted by Ruby 2.6 in F30 timeframe.
+Provides:   ruby(irb) = %{ruby_version}%{?development_release}-%{release}
+Provides:   ruby-irb = %{ruby_version}%{?development_release}-%{release}
+Obsoletes:  ruby-irb < %{ruby_version}%{?development_release}-%{release}
 BuildArch:  noarch
 
 %description -n rubygem-irb
@@ -487,13 +427,11 @@ 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
+License:    GPL-2.0-only AND Ruby AND BSD-3-Clause AND CC-BY-2.5 AND OFL-1.1-RFN
 Requires:   rubygem(io-console)
 Requires:   rubygem(json) >= %{json_version}
 Provides:   rdoc = %{version}-%{release}
@@ -519,8 +457,7 @@ 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
+License:    Ruby OR BSD-2-Clause
 Provides:   bundled(rubygem-bigdecimal) = %{bigdecimal_version}
 
 %description -n rubygem-bigdecimal
@@ -550,18 +487,9 @@ 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
+# Unicode-DFS-2015: ext/json/ext/generator/generator.c
+License:    (Ruby OR BSD-2-Clause) AND Unicode-DFS-2015
 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)
 
 %description -n rubygem-json
 This is a implementation of the JSON specification according to RFC 4627.
@@ -572,9 +500,9 @@ 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}}
+Provides:   bundled(rubygem-psych) = %{psych_version}
 
 %description -n rubygem-psych
 Psych is a YAML parser and emitter. Psych leverages
@@ -604,9 +532,7 @@ 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-thor) = %{bundler_thor_version}
-Provides:   bundled(rubygem-tsort) = %{bundler_tsort_version}
 Provides:   bundled(rubygem-uri) = %{bundler_uri_version}
 BuildArch:  noarch
 
@@ -622,37 +548,13 @@ many machines, systematically and repeatably.
 
 %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
@@ -667,13 +569,16 @@ Provides:   bundled(rubygem-minitest) = %{minitest_version}
 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.
 
@@ -797,19 +702,14 @@ analysis result in RBS format, a standard type description format for Ruby
 %setup -q -n %{ruby_archive}
 
 %patch 0 -p1
-
-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
+%patch 9 -p1
+%patch 10 -p1
+%patch 11 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -843,8 +743,6 @@ pushd %{_vpath_builddir}
         --with-ruby-version='' \
         --enable-multiarch \
         %{?with_yjit: --enable-yjit} \
-        %{?with_zjit: --enable-zjit} \
-        %{?with_rust: rustc_flags='%{build_rustflags}'} \
 
 popd
 
@@ -863,16 +761,6 @@ rm -rf %{buildroot}
 # 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}
-
 # Rename the ruby executable. It is replaced by RubyPick.
 %{?with_rubypick:mv %{buildroot}%{_bindir}/%{name}{,-mri}}
 
@@ -882,7 +770,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) || :
@@ -900,10 +789,10 @@ sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/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}
+install -m 644 %{SOURCE8} %{buildroot}%{_fileattrsdir}
 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,7 +808,32 @@ 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_libdir irb}
+mv %{buildroot}%{ruby_libdir}/irb* %{buildroot}%{gem_libdir irb}
+mv %{buildroot}%{gem_spec -d irb} %{buildroot}%{gem_spec irb}
+ln -s %{gem_libdir irb}/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_libdir irb}/'{}' %{buildroot}%{ruby_libdir}/'{}' \;
+popd
+
+mkdir -p %{buildroot}%{gem_libdir rdoc}
+mv %{buildroot}%{ruby_libdir}/rdoc* %{buildroot}%{gem_libdir rdoc}
+mv %{buildroot}%{gem_spec -d rdoc} %{buildroot}%{gem_spec rdoc}
+
+mkdir -p %{buildroot}%{gem_libdir bigdecimal}
+mkdir -p %{buildroot}%{gem_extdir_mri bigdecimal}
+mv %{buildroot}%{ruby_libdir}/bigdecimal %{buildroot}%{gem_libdir bigdecimal}
+mv %{buildroot}%{ruby_libarchdir}/bigdecimal.so %{buildroot}%{gem_extdir_mri bigdecimal}
+touch %{buildroot}%{gem_extdir_mri bigdecimal}/gem.build_complete
+mv %{buildroot}%{gem_spec -d bigdecimal} %{buildroot}%{gem_spec bigdecimal}
+ln -s %{gem_libdir bigdecimal}/bigdecimal %{buildroot}%{ruby_libdir}/bigdecimal
+ln -s %{gem_extdir_mri bigdecimal}/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}
@@ -969,9 +883,7 @@ 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
 # 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
@@ -991,6 +903,7 @@ 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.*
@@ -999,16 +912,8 @@ sed -i 's/^/%lang(ja) /' .ruby-doc.ja
 %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=%{_vpath_builddir}/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.
@@ -1019,17 +924,16 @@ checksec --format=xml --file=%{_vpath_builddir}/libruby.so.%{ruby_version} | \
 # Molinillo.
 make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
   module Gem; module Resolver; end; end; \
-  require 'rubygems/vendor/molinillo/lib/molinillo/gem_metadata'; \
+  require 'rubygems/resolver/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}'; \
+  puts %Q[Gem::Resolver::Molinillo::VERSION: #{Gem::Resolver::Molinillo::VERSION}]; \
+  exit 1 if Gem::Resolver::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'; \
+  require 'rubygems/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}'; \
@@ -1038,7 +942,7 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
 # 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'; \
+  require 'rubygems/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}'; \
@@ -1047,7 +951,7 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
 # OptParse.
 make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
   module Gem; end; \
-  require 'rubygems/vendor/optparse/lib/optparse'; \
+  require 'rubygems/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}'; \
@@ -1056,26 +960,16 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
 # Resolv.
 make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
   module Gem; end; \
-  require 'rbconfig'; \
-  require 'rubygems/vendor/resolv/lib/resolv'; \
+  require 'rubygems/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'; \
+  require 'rubygems/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}'; \
@@ -1084,21 +978,12 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
 # TSort
 make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
   module Gem; end; \
-  require 'rubygems/vendor/tsort/lib/tsort'; \
+  require 'rubygems/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}'; \
-\""
-
 # Check Bundler bundled dependencies versions.
 
 # connection_pool.
@@ -1132,22 +1017,12 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
 make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
   module Gem; end; \
   module Bundler; end; \
-  require 'rbconfig'; \
   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}'; \
-\""
-
 # Thor.
 make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
   module Bundler; end; \
@@ -1175,17 +1050,6 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
   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}'; \
-\""
-
 
 # test_debug(TestRubyOptions) fails due to LoadError reported in debug mode,
 # when abrt.rb cannot be required (seems to be easier way then customizing
@@ -1194,29 +1058,14 @@ touch %{_vpath_builddir}/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 -C %{_vpath_builddir} 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}
+make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=%{SOURCE14}
 %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"
-
-
 DISABLE_TESTS=""
 MSPECOPTS=""
 
@@ -1226,12 +1075,12 @@ 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"
+  make -C %{_vpath_builddir} 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"
+  %{SOURCE15} %{_builddir}/%{buildsubdir} --verbose"
 
 %{?with_bundler_tests:make -C %{_vpath_builddir} test-bundler-parallel}
 
@@ -1274,43 +1123,64 @@ 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}/abbrev.rb
+%{ruby_libdir}/base64.rb
+%{ruby_libdir}/benchmark*
 %{ruby_libdir}/bundled_gems.rb
 %{ruby_libdir}/cgi*
 %{ruby_libdir}/coverage.rb
+%{ruby_libdir}/csv*
 %{ruby_libdir}/date.rb
 %{ruby_libdir}/delegate*
 %{ruby_libdir}/digest*
+%{ruby_libdir}/drb*
 %{ruby_libdir}/English.rb
 %{ruby_libdir}/erb*
 %{ruby_libdir}/error_highlight*
 %{ruby_libdir}/expect.rb
+%{ruby_libdir}/fiddle*
 %{ruby_libdir}/fileutils.rb
 %{ruby_libdir}/find.rb
 %{ruby_libdir}/forwardable*
+%{ruby_libdir}/getoptlong*
 %{ruby_libdir}/ipaddr.rb
+%{ruby_libdir}/kconv.rb
+%{ruby_libdir}/logger*
 %{ruby_libdir}/mkmf.rb
 %{ruby_libdir}/monitor.rb
+%{ruby_libdir}/mutex_m.rb
 %{ruby_libdir}/net
 %{ruby_libdir}/objspace*
+%{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}/pstore*
 %{ruby_libdir}/random
+%{ruby_libdir}/readline.rb
+%{ruby_libdir}/reline*
 %{ruby_libdir}/resolv.rb
+%{ruby_libdir}/resolv-replace.rb
+%{ruby_libdir}/rinda
 %{ruby_libdir}/ripper*
+%dir %{ruby_libdir}/ruby_vm
+%{ruby_libdir}/ruby_vm/rjit
 %{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
@@ -1404,11 +1274,14 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{ruby_libarchdir}/erb/escape.so
 %{ruby_libarchdir}/etc.so
 %{ruby_libarchdir}/fcntl.so
+%{ruby_libarchdir}/fiddle.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
@@ -1417,6 +1290,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{ruby_libarchdir}/socket.so
 %{ruby_libarchdir}/stringio.so
 %{ruby_libarchdir}/strscan.so
+%{ruby_libarchdir}/syslog.so
 %{ruby_libarchdir}/zlib.so
 
 # Default gems
@@ -1456,10 +1330,16 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{_rpmconfigdir}/rubygems.con
 
 %files default-gems
+%gem_spec -d abbrev
+%gem_spec -d base64
+%gem_spec -d benchmark
+%gem_spec -d cgi
+%gem_spec -d csv
 %gem_spec -d date
 %gem_spec -d delegate
 %gem_spec -d did_you_mean
 %gem_spec -d digest
+%gem_spec -d drb
 %gem_spec -d english
 %gem_spec -d erb
 %gem_instdir erb
@@ -1468,23 +1348,37 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %gem_spec -d error_highlight
 %gem_spec -d etc
 %gem_spec -d fcntl
+%gem_spec -d fiddle
 %gem_spec -d fileutils
 %gem_spec -d find
 %gem_spec -d forwardable
+%gem_spec -d getoptlong
 %gem_spec -d io-nonblock
 %gem_spec -d io-wait
 %gem_spec -d ipaddr
+%gem_spec -d logger
+%gem_spec -d mutex_m
 %gem_spec -d net-http
 %gem_spec -d net-protocol
+%gem_spec -d nkf
+%gem_spec -d observer
 %gem_spec -d open3
 %gem_spec -d open-uri
 %gem_spec -d optparse
 %gem_spec -d openssl
+%gem_spec -d ostruct
+%gem_spec -d pathname
 %gem_spec -d pp
 %gem_spec -d prettyprint
+%gem_spec -d pstore
+%gem_spec -d readline
+%gem_spec -d reline
 %gem_spec -d resolv
+%gem_spec -d resolv-replace
+%gem_spec -d rinda
 %gem_spec -d ruby2_keywords
 %gem_spec -d securerandom
+%gem_spec -d set
 %gem_spec -d shellwords
 %gem_spec -d singleton
 %gem_spec -d stringio
@@ -1492,6 +1386,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %gem_spec -d syntax_suggest
 %{_bindir}/syntax_suggest
 %gem_instdir syntax_suggest
+%gem_spec -d syslog
 %gem_spec -d tempfile
 %gem_spec -d time
 %gem_spec -d timeout
@@ -1501,24 +1396,15 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %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
 
 %files -n rubygem-irb
 %{_bindir}/irb
-%dir %{gem_instdir irb}
-%{gem_libdir irb}
+%{ruby_libdir}/irb*
+%{gem_instdir 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
 %{_mandir}/man1/irb.1*
 
 %files -n rubygem-rdoc
@@ -1526,7 +1412,6 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{_bindir}/ri
 %{gem_instdir rdoc}
 %{gem_spec rdoc}
-%{gem_plugin rdoc}
 %{_mandir}/man1/ri*
 
 %files doc -f .ruby-doc.en -f .ruby-doc.ja
@@ -1536,6 +1421,8 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{_datadir}/ri
 
 %files -n rubygem-bigdecimal
+%{ruby_libdir}/bigdecimal*
+%{ruby_libarchdir}/bigdecimal*
 %{gem_extdir_mri bigdecimal}
 %{gem_instdir bigdecimal}
 %{gem_spec bigdecimal}
@@ -1572,199 +1459,6 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{_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}
@@ -1784,74 +1478,64 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{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}
+# net-ftp
+%dir %{gem_instdir net-ftp}
+%{gem_instdir net-ftp}/Gemfile
+%license %{gem_instdir net-ftp}/LICENSE.txt
+%doc %{gem_instdir net-ftp}/README.md
+%{gem_instdir net-ftp}/Rakefile
+%{gem_libdir net-ftp}
+%{gem_spec net-ftp}
 
-# 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}
+# net-imap
+%dir %{gem_instdir net-imap}
+%{gem_instdir net-imap}/Gemfile
+%license %{gem_instdir net-imap}/LICENSE.txt
+%doc %{gem_instdir net-imap}/README.md
+%{gem_instdir net-imap}/Rakefile
+%{gem_instdir net-imap}/docs
+%{gem_libdir net-imap}
+%{gem_instdir net-imap}/rakelib
+%{gem_spec net-imap}
 
-# 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
+# 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}
 
-# 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
+# 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}
 
-# 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
+# matrix
+%dir %{gem_instdir matrix}
+%license %{gem_instdir matrix}/LICENSE.txt
+%{gem_libdir matrix}
+%{gem_spec matrix}
 
-# 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
+# prime
+%dir %{gem_instdir prime}
+%{gem_instdir prime}/Gemfile
+%license %{gem_instdir prime}/LICENSE.txt
+%doc %{gem_instdir prime}/README.md
+%{gem_instdir prime}/Rakefile
+%{gem_instdir prime}/bin
+%{gem_libdir prime}
+%{gem_spec prime}
 
 %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
@@ -1879,38 +1563,35 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 
 %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 %{_libdir}/gems/%{name}/rbs-%{rbs_version}
+%{_libdir}/gems/%{name}/rbs-%{rbs_version}/gem.build_complete
+%{_libdir}/gems/%{name}/rbs-%{rbs_version}/rbs_extension.so
 %dir %{gem_instdir rbs}
+%exclude %{gem_instdir rbs}/.*
 %license %{gem_instdir rbs}/BSDL
 %doc %{gem_instdir rbs}/CHANGELOG.md
 %license %{gem_instdir rbs}/COPYING
+%{gem_instdir rbs}/Gemfile*
 %doc %{gem_instdir rbs}/README.md
 %{gem_instdir rbs}/Rakefile
 %{gem_instdir rbs}/Steepfile
-%{gem_instdir rbs}/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}
 
 %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
@@ -1920,7 +1601,6 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %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
@@ -1954,132 +1634,17 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
 %{_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_instdir typeprof}/exe
 %{gem_libdir typeprof}
+%doc %{gem_instdir typeprof}/tools
+%exclude %{gem_instdir typeprof}/typeprof-lsp
 %{gem_spec typeprof}
+%doc %{gem_instdir typeprof}/Gemfile*
 %doc %{gem_instdir typeprof}/README.md
+%doc %{gem_instdir typeprof}/Rakefile
 
 
 %changelog
-* 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
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..10a3d0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ruby-4.0.1.tar.xz) = b67d9d1f97ba30200d103f8454e39dc2d0450819d51d91eb5451d44b0bafc56d2fa48bb1be6c5081babe5828f679984bad02b9bcee7441f6bd34c0a95b8f200b
+SHA512 (ruby-3.3.0.tar.xz) = 7959c5753bfa0bfc4d6d74060869aabbe9815c1c97930659da11b917ee0803ddbbd80e869e00c48b8694b4ba48709c3b6493fd045568e36e902616c35ababf01
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