Fix bundler improperly resolving archful gems in Gemfile.lock.

For more information see:
https://github.com/sclorg/s2i-ruby-container/issues/469

Upstream backport requested in
https://bugs.ruby-lang.org/issues/19576

Resolves: rhbz#2178171

ruby.spec

@@ -195,6 +195,16 @@ Patch28: ruby-irb-1.4.1-set-rdoc-soft-dep.patch
 # https://github.com/ruby/ruby/commit/bffadcd6d46ccfccade79ce0efb60ced8eac4483
 # https://bugs.ruby-lang.org/issues/19529#note-7
 Patch29: ruby-3.1.4-Skip-test_compaction_bug_19529-if-compaction-unsupported.patch
+# Bundler does not correctly resolve archful gems in 2.3.26.
+# Example of such an issue
+# https://github.com/sclorg/s2i-ruby-container/issues/469
+# The patch is an amalgamation of the following:
+# https://github.com/rubygems/rubygems/pull/6225
+# https://github.com/rubygems/rubygems/commit/7b64c64262a7a980c0eb23b96ea56cf72ea06e89
+# Backport requested in
+# https://bugs.ruby-lang.org/issues/19576
+Patch30: rubygem-bundler-2.3.26-Provide-fix-for-bundler-Gemfile-resolving-regression.patch
+Patch31: rubygem-bundler-2.3.26-Tests-from-bundler-PR-6225.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Suggests: rubypick
@@ -667,6 +677,11 @@ rm -rf ext/fiddle/libffi*
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p2
+
+pushd spec/bundler
+%patch31 -p3
+popd
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -1541,6 +1556,8 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/"
 - Upgrade to Ruby 3.1.4.
 - Fix ReDoS vulnerability in URI (CVE-2023-28755)
 - Fix ReDoS vulnerability in Time (CVE-2023-28756)
+- Fix bundler improperly resolving archful gems in Gemfile.lock.
+  Resolves: rhbz#2178171
 
 * Fri Jan 20 2023 Jun Aruga <jaruga@redhat.com> - 3.1.3-174
 - Fix for tzdata-2022g.