From 9819174c8dd5a04f7cc47d50d586cc6f72b8f0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Fri, 16 Sep 2022 17:09:27 +0200
Subject: [PATCH] Use --enable-mkmf-verbose configuration opiton instead of
 patch.

https://github.com/ruby/ruby/pull/5879
---
 ruby-1.9.3-mkmf-verbose.patch | 25 -------------------------
 ruby.spec                     |  4 +---
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 ruby-1.9.3-mkmf-verbose.patch

diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch
deleted file mode 100644
index 03128be..0000000
--- a/ruby-1.9.3-mkmf-verbose.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 28cc0749d6729aa2444661ee7b411e183fe220b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Mon, 19 Nov 2012 15:14:51 +0100
-Subject: [PATCH] Verbose mkmf.
-
----
- lib/mkmf.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/mkmf.rb b/lib/mkmf.rb
-index 682eb46..e6b1445 100644
---- a/lib/mkmf.rb
-+++ b/lib/mkmf.rb
-@@ -1971,7 +1971,7 @@ def configuration(srcdir)
- SHELL = /bin/sh
- 
- # V=0 quiet, V=1 verbose.  other values don't work.
--V = #{CONFIG['MKMF_VERBOSE']}
-+V = 1
- V0 = $(V:0=)
- Q1 = $(V:1=)
- Q = $(Q1:0=@)
--- 
-1.8.3.1
-
diff --git a/ruby.spec b/ruby.spec
index 1506817..2d281d5 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -145,8 +145,6 @@ 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
 Patch4: ruby-2.1.0-custom-rubygems-location.patch
-# Make mkmf verbose by default
-Patch5: ruby-1.9.3-mkmf-verbose.patch
 # The ABRT hook used to be initialized by preludes via following patches:
 # https://bugs.ruby-lang.org/issues/8566
 # https://bugs.ruby-lang.org/issues/15306
@@ -655,7 +653,6 @@ rm -rf ext/fiddle/libffi*
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch19 -p1
@@ -687,6 +684,7 @@ autoconf
         --with-ruby-pc='%{name}.pc' \
         --with-compress-debug-sections=no \
         --disable-rpath \
+        --enable-mkmf-verbose \
         --enable-shared \
         --with-ruby-version='' \
         --enable-multiarch \