From 222d09cd59d838256225a82488ac95f5cb00f563 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 01 2020 11:17:14 +0000
Subject: import rh-ruby25-ruby-2.5.5-8.el7


---

diff --git a/SOURCES/ruby-2.6.0-rescue-on-EISDIR-in-test_open_tempfile_path.patch b/SOURCES/ruby-2.6.0-rescue-on-EISDIR-in-test_open_tempfile_path.patch
new file mode 100644
index 0000000..dc08082
--- /dev/null
+++ b/SOURCES/ruby-2.6.0-rescue-on-EISDIR-in-test_open_tempfile_path.patch
@@ -0,0 +1,26 @@
+From 785ace12f903cfae848ea38d7b8a0cb3439379f3 Mon Sep 17 00:00:00 2001
+From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+Date: Tue, 11 Dec 2018 08:44:00 +0000
+Subject: [PATCH] CentOS-7 (1810)'s header has O_TMPFILE but kernel doesn't
+ support it
+
+http://rubyci.s3.amazonaws.com/centos7/ruby-trunk/log/20181206T080003Z.diff.html.gz
+
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+---
+ test/ruby/test_file.rb | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
+index 89757287d194..5e9574cf32e3 100644
+--- a/test/ruby/test_file.rb
++++ b/test/ruby/test_file.rb
+@@ -504,6 +504,8 @@ def test_open_tempfile_path
+         io = File.open(tmpdir, File::RDWR | File::TMPFILE)
+       rescue Errno::EINVAL
+         skip 'O_TMPFILE not supported (EINVAL)'
++      rescue Errno::EISDIR
++        skip 'O_TMPFILE not supported (EISDIR)'
+       rescue Errno::EOPNOTSUPP
+         skip 'O_TMPFILE not supported (EOPNOTSUPP)'
+       end
diff --git a/SPECS/ruby.spec b/SPECS/ruby.spec
index 854405f..5417868 100644
--- a/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
@@ -24,7 +24,7 @@
 %endif
 
 
-%global release 7
+%global release 8
 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
@@ -151,6 +151,9 @@ Patch12: ruby-2.6.0-configure-fstack-protector-strong.patch
 # Fix generated rdoc template issues.
 # https://github.com/ruby/rdoc/commit/d05e6269d4a4dfd701f5ddb3ae34306cba891511
 Patch13: ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch
+# Fix failing test_open_tempfile_path test case (skip on EISDIR exception).
+# https://github.com/ruby/ruby/commit/785ace12f903cfae848ea38d7b8a0cb3439379f3
+Patch14: ruby-2.6.0-rescue-on-EISDIR-in-test_open_tempfile_path.patch
 
 Requires: %{?scl_prefix}%{pkg_name}-libs%{?_isa} = %{version}-%{release}
 Requires: %{?scl_prefix}ruby(rubygems) >= %{rubygems_version}
@@ -540,6 +543,13 @@ HTTP.
 rm -rf ext/psych/yaml
 rm -rf ext/fiddle/libffi*
 
+# Remove file with non-commercial license
+# https://bugzilla.redhat.com/show_bug.cgi?id=1846113
+rm -f gems/did_you_mean-1.2.0/evaluation/incorrect_words.yaml
+sed -i 's/"evaluation\/incorrect_words.yaml", //' \
+  gems/did_you_mean-1.2.0/did_you_mean.gemspec
+
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -552,6 +562,7 @@ rm -rf ext/fiddle/libffi*
 %patch10 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -1103,6 +1114,10 @@ make check TESTS="-v $DISABLE_TESTS"
 %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
 
 %changelog
+* Fri Aug 21 2020 Pavel Valena <pvalena@redhat.com> - 2.5.5-8
+- Remove file with non-commercial license from did_you_mean gem.
+  Resolves: rhbz#1848915
+
 * Mon Apr 15 2019 Jun Aruga <jaruga@redhat.com> - 2.5.5-7
 - Upgrade to Ruby 2.5.5.
 - Delete directory using symlink when decompressing tar