From e6258a2cfb7e63ebb5c9de3c9dd29f4f79c3296c Mon Sep 17 00:00:00 2001 From: shixuantong Date: Mon, 13 Mar 2023 16:14:13 +0800 Subject: [PATCH] ruby/irb Drop hard dependency on RDoc --- ...ort-irb-Drop-hard-dependency-on-RDoc.patch | 26 +++++++++++++++++++ ruby.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 backport-irb-Drop-hard-dependency-on-RDoc.patch diff --git a/backport-irb-Drop-hard-dependency-on-RDoc.patch b/backport-irb-Drop-hard-dependency-on-RDoc.patch new file mode 100644 index 0000000..71ed31a --- /dev/null +++ b/backport-irb-Drop-hard-dependency-on-RDoc.patch @@ -0,0 +1,26 @@ +From 46c3a93982d0b81668668a65c10bc3670a488d8a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Tue, 23 Aug 2022 10:41:28 +0200 +Subject: [PATCH] [ruby/irb] Drop hard dependency on RDoc. + +This has been introduced in https://github.com/ruby/irb/commit/026700499dfd, +but it seems that this is just be mistake, otherwise the later handling +of `LoadError` would not be needed. + +https://github.com/ruby/irb/commit/54c8df06ff +--- + lib/irb/input-method.rb | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb +index fd68239ee38d6..a8227caa9c32d 100644 +--- a/lib/irb/input-method.rb ++++ b/lib/irb/input-method.rb +@@ -14,7 +14,6 @@ + require_relative 'completion' + require 'io/console' + require 'reline' +-require 'rdoc' + + module IRB + STDIN_FILE_NAME = "(line)" # :nodoc: diff --git a/ruby.spec b/ruby.spec index 475f361..abfaaa9 100644 --- a/ruby.spec +++ b/ruby.spec @@ -30,7 +30,7 @@ Name: ruby Version: %{ruby_version} -Release: 131 +Release: 132 Summary: Object-oriented scripting language interpreter License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD URL: https://www.ruby-lang.org/en/ @@ -87,6 +87,7 @@ Patch6006: backport-CVE-2019-16162.patch Patch6007: backport-CVE-2019-16163.patch Patch6008: backport-Fix-test_cgi_cookie_new_with_domain-to-pass-on-older.patch Patch6009: backport-Loosen-the-domain-regex-to-accept-.-29.patch +Patch6010: backport-irb-Drop-hard-dependency-on-RDoc.patch Provides: %{name}-libs = %{version}-%{release} Obsoletes: %{name}-libs < %{version}-%{release} @@ -883,6 +884,9 @@ make runruby TESTRUN_SCRIPT=%{SOURCE13} %{gem_dir}/specifications/matrix-%{matrix_version}.gemspec %changelog +* Mon Mar 13 2023 shixuantong - 3.1.3-132 +- ruby/irb Drop hard dependency on RDoc + * Fri Mar 10 2023 shixuantong - 3.1.3-131 - remove rubygem-bundler -- Gitee