From 1e60df6dc1d874921b88243affeb69a06271ccbb Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Jan 24 2019 14:15:00 +0000
Subject: Loosen RDoc dependency.


---

diff --git a/ruby.spec b/ruby.spec
index 55db047..2f1a9e0 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -147,6 +147,9 @@ Patch10: ruby-2.6.0-Try-to-update-cert.patch
 # gems unpacked by setup macro.
 # https://github.com/rubygems/rubygems/issues/2587
 Patch11: ruby-2.6.0-No-chdir-for-build.patch
+# This allows to loosen the RDoc dependency again.
+# https://github.com/rubygems/rubygems/pull/2604
+Patch12: rubygems-3.0.3-Avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch
 
 # Add support for .include directive used by OpenSSL config files.
 # https://github.com/ruby/openssl/pull/216
@@ -235,9 +238,7 @@ Version:    %{rubygems_version}
 Group:      Development/Libraries
 License:    Ruby or MIT
 Requires:   ruby(release)
-# RDoc is hard dependency for now :(
-# https://github.com/rubygems/rubygems/issues/2483
-Requires: rubygem(rdoc) >= %{rdoc_version}
+Recommends: rubygem(rdoc) >= %{rdoc_version}
 Recommends: rubygem(io-console) >= %{io_console_version}
 Requires:   rubygem(openssl) >= %{openssl_version}
 Requires:   rubygem(psych) >= %{psych_version}
@@ -566,6 +567,7 @@ rm -rf ext/fiddle/libffi*
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %patch22 -p1
 %patch23 -p1
 
@@ -1188,6 +1190,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %changelog
 * Thu Jan 24 2019 Vít Ondruch <vondruch@redhat.com> - 2.6.0-111
 - Properly generate versioned ruby(rubygems) dependencies.
+- Loosen RDoc dependency.
 
 * Thu Jan 17 2019 Vít Ondruch <vondruch@redhat.com> - 2.6.0-110
 - Upgrade to Ruby 2.6.0.
diff --git a/rubygems-3.0.3-Avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch b/rubygems-3.0.3-Avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch
new file mode 100644
index 0000000..690d245
--- /dev/null
+++ b/rubygems-3.0.3-Avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch
@@ -0,0 +1,24 @@
+From c16675582a68800ef17b6056110e0a8bcdb38b55 Mon Sep 17 00:00:00 2001
+From: SHIBATA Hiroshi <hsbt@ruby-lang.org>
+Date: Tue, 22 Jan 2019 09:37:23 +0900
+Subject: [PATCH] Avoid rdoc hook when it's failed to load rdoc library.
+
+  Fixed #2483
+---
+ lib/rubygems/rdoc.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb
+index dfaf7c55bf..4e16fbb86f 100644
+--- a/lib/rubygems/rdoc.rb
++++ b/lib/rubygems/rdoc.rb
+@@ -18,7 +18,7 @@
+   module Gem
+     RDoc = ::RDoc::RubygemsHook
+   end
++
++  Gem.done_installing(&Gem::RDoc.method(:generation_hook))
+ rescue LoadError
+ end
+-
+-Gem.done_installing(&Gem::RDoc.method(:generation_hook))