From 63fcfca18eb82dac6483c417e56e305d43d3b43d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 15 2021 17:15:43 +0000
Subject: import ruby-3.0.2-140.module+el8.5.0+12856+0c654ebc


---

diff --git a/SPECS/ruby.spec b/SPECS/ruby.spec
index 632304f..65a13e7 100644
--- a/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
@@ -22,7 +22,7 @@
 %endif
 
 
-%global release 139
+%global release 140
 %{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
@@ -80,8 +80,6 @@
 %bcond_without hardening_test
 %endif
 
-%bcond_with tests
-
 # LTO appears to cause some issue to SEGV handler.
 # https://bugs.ruby-lang.org/issues/17052
 %define _lto_cflags %{nil}
@@ -687,7 +685,13 @@ mkdir -p %{buildroot}%{gem_dir}/gems/irb-%{irb_version}/lib
 mv %{buildroot}%{ruby_libdir}/irb* %{buildroot}%{gem_dir}/gems/irb-%{irb_version}/lib
 mv %{buildroot}%{gem_dir}/specifications/default/irb-%{irb_version}.gemspec %{buildroot}%{gem_dir}/specifications
 ln -s %{gem_dir}/gems/irb-%{irb_version}/lib/irb.rb %{buildroot}%{ruby_libdir}/irb.rb
-ln -s %{gem_dir}/gems/irb-%{irb_version}/lib/irb %{buildroot}%{ruby_libdir}/irb
+# TODO: This should be possible to replaced by simple directory symlink
+# after ~ F31 EOL (rhbz#1691039).
+mkdir -p %{buildroot}%{ruby_libdir}/irb
+pushd %{buildroot}%{gem_dir}/gems/irb-%{irb_version}/lib
+find irb -type d -mindepth 1 -exec mkdir %{buildroot}%{ruby_libdir}/'{}' \;
+find irb -type f -exec ln -s %{gem_dir}/gems/irb-%{irb_version}/lib/'{}' %{buildroot}%{ruby_libdir}/'{}' \;
+popd
 
 mkdir -p %{buildroot}%{gem_dir}/gems/rdoc-%{rdoc_version}/lib
 mv %{buildroot}%{ruby_libdir}/rdoc* %{buildroot}%{gem_dir}/gems/rdoc-%{rdoc_version}/lib
@@ -777,7 +781,6 @@ sed -i 's/^/%lang(ja) /' .ruby-doc.ja
 rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github
 
 %check
-%if %{with tests}
 %if 0%{?with_hardening_test}
 # Check Ruby hardening.
 checksec --file=libruby.so.%{ruby_version} | \
@@ -869,8 +872,6 @@ MSPECOPTS=""
 %{?test_timeout_scale:RUBY_TEST_TIMEOUT_SCALE="%{test_timeout_scale}"} \
   make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 
-%endif
-
 %files
 %license BSDL
 %license COPYING
@@ -1344,6 +1345,10 @@ MSPECOPTS=""
 
 
 %changelog
+* Tue Oct 05 2021 Jarek Prokop <jprokop@redhat.com> - 3.0.2-140
+- Fix rubygem-irb upgrade not working due to directory -> symlink conversion.
+  Resolves: rhbz#2010403
+
 * Tue Jul 13 2021 Jarek Prokop <jprokop@redhat.com> - 3.0.2-139
 - Upgrade to Ruby 3.0.2.
   Related: rhbz#1938942