4 changed files with 201 additions and 55 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/rspec-core-3.7.1.gem
-SOURCES/rubygem-rspec-core-3.7.1-full.tar.gz
+SOURCES/rspec-core-3.10.1.gem
+SOURCES/rubygem-rspec-core-3.10.1-full.tar.gz
--- a/.rubygem-rspec-core.metadata
+++ b/.rubygem-rspec-core.metadata
@ -1,2 +1,2 @@
-1289853869b2e4c315a16bc3ac7dc3dd456c839f SOURCES/rspec-core-3.7.1.gem
-2db7ab10ee149ee15985cc1021607ca1d631e4c4 SOURCES/rubygem-rspec-core-3.7.1-full.tar.gz
+c462b4ecc1ff569a2d0019e7918d46f4d9086a8f SOURCES/rspec-core-3.10.1.gem
+2f23ead60f1e6b569eb148ade3c7de6c32b29a79 SOURCES/rubygem-rspec-core-3.10.1-full.tar.gz
--- a/SOURCES/rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch
+++ b/SOURCES/rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch
@ -0,0 +1,28 @@
+From 7550f7b024323c15ed21d13e930f59a64455e5d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Thu, 18 Mar 2021 15:45:48 +0100
+Subject: [PATCH] Filter content of /usr/share/ruby
+
+Some Linux distributions, such as Fedora, are using this location to
+store Ruby StdLib. Therefore, it would be nice to filter this location
+similarly to /lib\d*/ruby/
+---
+ lib/rspec/core/backtrace_formatter.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rspec/core/backtrace_formatter.rb b/lib/rspec/core/backtrace_formatter.rb
+index e0bee52a..27008e2c 100644
+--- a/lib/rspec/core/backtrace_formatter.rb
+++ b/lib/rspec/core/backtrace_formatter.rb
+@@ -8,7 +8,7 @@ module RSpec
+       def initialize
+         @full_backtrace = false
+ 
+-        patterns = %w[ /lib\d*/ruby/ bin/ exe/rspec /lib/bundler/ /exe/bundle: ]
+        patterns = %w[ /lib\d*/ruby/ /share/ruby/ bin/ exe/rspec /lib/bundler/ /exe/bundle: ]
+         patterns << "org/jruby/" if RUBY_PLATFORM == 'java'
+         patterns.map! { |s| Regexp.new(s.gsub("/", File::SEPARATOR)) }
+ 
+-- 
+2.30.0
+
--- a/SPECS/rubygem-rspec-core.spec
+++ b/SPECS/rubygem-rspec-core.spec
@ -1,46 +1,65 @@
-%global	majorver	3.7.1
+%global	majorver	3.10.1
 #%%global	preminorver	.rc6
 %global	rpmminorver	.%(echo %preminorver | sed -e 's|^\\.\\.*||')
 %global	fullver	%{majorver}%{?preminorver}

-%global	fedorarel	5
+%global	fedorarel	7

 %global	gem_name	rspec-core

 # %%check section needs rspec-core, however rspec-core depends on rspec-mocks
 # runtime part of rspec-mocks does not depend on rspec-core
-%global	need_bootstrap_set	0
-%if 0%{?fedora} >= 25
 # Disable test for now due to cucumber v.s. gherkin dependency issue
 # pulled by aruba
 %global	need_bootstrap_set	0
-%endif

-Summary:	Rspec-2 runner and formatters
+# Disable Aruba support due to excesive dependency chain. This also disables
+# Cucumber integration test suite, which depends on Aruba as well.
+%bcond_with aruba
+
+Summary:	RSpec runner and formatters
 Name:		rubygem-%{gem_name}
 Version:	%{majorver}
-Release:	%{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}
+Release:	%{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1

-Group:		Development/Languages
 License:	MIT
 URL:		http://github.com/rspec/rspec-mocks
 Source0:	http://rubygems.org/gems/%{gem_name}-%{fullver}.gem
-# %%{SOURCE2} %%{name} %%{version} 
+# %%{SOURCE2} %%{name} %%{version}
 Source1:	rubygem-%{gem_name}-%{version}-full.tar.gz
 Source2:	rspec-related-create-full-tarball.sh
+# Adjust backtrace filter for Fedora placement of StdLib.
+# https://github.com/rspec/rspec-core/pull/2881
+Patch0:		rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch

 #BuildRequires:	ruby(release)
 BuildRequires:	rubygems-devel
 %if 0%{?need_bootstrap_set} < 1
+%{?with_aruba:BuildRequires: rubygem(minitest)}
+BuildRequires: rubygem(rake)
 BuildRequires:	rubygem(rspec)
-BuildRequires:	rubygem(rake)
+%if %{with aruba}
+BuildRequires: rubygem(aruba)
+# Newly
+BuildRequires:	rubygem(flexmock)
+BuildRequires:	rubygem(mocha)
+BuildRequires:	rubygem(rr)
+%endif
 BuildRequires:	rubygem(coderay)
 BuildRequires:	rubygem(thread_order)
 BuildRequires:	git
+# New test
+%{?with_aruba:BuildRequires: rubygem(cucumber)}
+BuildRequires:	rubygem(test-unit)
+
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires:	glibc-langpack-en
+%endif
+
 %endif
 # Make the following installed by default
 # lib/rspec/core/rake_task
-Recommends:	rubygem(rake)
+Requires:	rubygem(rake)
 # Optional
 #Requires:	rubygem(ZenTest)
 #Requires:	rubygem(flexmock)
@ -49,11 +68,10 @@ Recommends:	rubygem(rake)
 BuildArch:	noarch

 %description
-Behaviour Driven Development for Ruby.
+Behaviour Driven Development for Ruby. RSpec runner and example groups.

 %package	doc
 Summary:	Documentation for %{name}
-Group:		Documentation
 Requires:	%{name} = %{version}-%{release}

 %description	doc
@ -62,6 +80,7 @@ This package contains documentation for %{name}.

 %prep
 %setup -q -T -n %{gem_name}-%{version} -b 1
+%patch0 -p1
 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec

 %build
@ -77,46 +96,59 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts}

 %if 0%{?need_bootstrap_set} < 1
 %check
-LANG=en_US.UTF-8
-# Test failure needs investigation...
-# perhaps due to some incompatibility between libxml2 2.9.x
-# and rubygem-nokogiri
-
-FAILFILE=()
-FAILTEST=()
-FAILFILE+=("spec/rspec/core/formatters/progress_formatter_spec.rb")
-FAILTEST+=("produces the expected full output")
-FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb")
-FAILTEST+=("produces the expected full output")
-FAILFILE+=("spec/rspec/core/formatters/syntax_highlighter_spec.rb")
-FAILTEST+=("when CodeRay is available")
-# New from 3.5.3
-FAILFILE+=("spec/integration/suite_hooks_errors_spec.rb")
-FAILTEST+=("nicely formats errors")
-# New from 3.6.0
-FAILFILE+=("spec/integration/spec_file_load_errors_spec.rb")
-FAILTEST+=("nicely handles load-time errors")
-# NET??
-FAILFILE+=("spec/rspec/core/runner_spec.rb")
-FAILTEST+=("if drb server is started with 127.0.0.1")
-FAILFILE+=("spec/rspec/core/runner_spec.rb")
-FAILTEST+=("if drb server is started with localhost")
-
-for ((i = 0; i < ${#FAILFILE[@]}; i++)) {
-	sed -i \
-		-e "\@${FAILTEST[$i]}@s|do$|, :broken => true do|" \
-		${FAILFILE[$i]}
-}
+LANG=C.UTF-8

+%if ! %{with aruba}
 # Avoid dependency on Aruba. The files needs to be present, since they are
 # listed by `git ls-files` from 'library wide checks' shared example.
 truncate -s 0 spec/support/aruba_support.rb
 find spec/integration -exec truncate -s 0 {} \;
+%endif

+# Adjust the backtrace filters to our directory layout.
+sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \
+  spec/integration/{suite_hooks_errors,spec_file_load_errors}_spec.rb
+
+ruby -rrubygems -Ilib/ -S exe/rspec
+
+%if %{with aruba}
+# Mark failing test as broken
+sed -i features/command_line/init.feature \
+       -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|'
+
+%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
+for f in  \
+	`# disabling tests failing with rr 1.2.1` \
+	`# https://github.com/rspec/rspec-core/issues/2882` \
+	features/mock_framework_integration/use_rr.feature \
+	%{nil}
+do
+	mv $f ${f}.drop
+done
+%endif
+
+# Setup just right amount of paths to make the tests suite run.
+export RUBYOPT="-I$(pwd)/lib:$(ruby -e 'puts %w[rspec/support minitest test/unit].map {|r| Gem::Specification.find_by_path(r).full_require_paths}.join(?:)')"
+cucumber -v -f pretty features/ || \
+	cucumber -v -f pretty features/ \
+	--tag "not @broken" \
+	`# Explicitly skip 'skip-when-diff-lcs-1.3' and '@ruby-2-7' test cases. While` \
+	`# the conditions are correctly detected, the 'warning' called instead their` \
+	`# execution is troublesome, possibly due to upstream using old Cucumber?` \
+	--tag "not @skip-when-diff-lcs-1.3" \
+	--tag "not @ruby-2-7" \
+	%{nil}
+
+%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
+for f in  \
+	features/mock_framework_integration/use_rr.feature \
+	%{nil}
+do
+	mv ${f}.drop ${f}
+done
+%endif
+%endif

-# Do not execute the integration test suite, which requires Aruba.
-ruby -rrubygems -Ilib/ -S exe/rspec || \
-	ruby -rrubygems -Ilib/ -S exe/rspec --tag ~broken
 %endif

 %files
@ -137,12 +169,98 @@ ruby -rrubygems -Ilib/ -S exe/rspec || \
 %{gem_docdir}

 %changelog
-* Thu Jul 12 2018 Jun Aruga <jaruga@redhat.com> - 3.7.1-5
- Fix FTBFS by adding build dependency for RHEL.
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.10.1-7.1
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Fri Jun 29 2018 Vít Ondruch <vondruch@redhat.com> - 3.7.1-4
- Remove Aruba dependency.
- Remove unneeded BRs.
+* Thu Jul 15 2021 Pavel Valena <pvalena@redhat.com> - 3.10.1-7
+- Re-add Requires: rubygem(rake), as it's needed for runtime.
+  Resolves: rhbz#1982410
+  Resolves: rhbz#1982419
+
+* Fri Apr 23 2021 Vít Ondruch <vondruch@redhat.com> - 3.10.1-6
+- Disable integration test suite to cut down the dependency tree.
+  Resolves: rhbz#1952842
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.10.1-5.1
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Thu Mar 18 2021 Vít Ondruch <vondruch@redhat.com> - 3.10.1-5
+- Make test suite green.
+
+* Sun Feb 28 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-4
+- Add conditional for eln
+
+* Wed Feb 17 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-3
+- rr 1.2.1: Disable failing cucumber suite for now
+
+* Tue Jan 26 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-2
+- Ruby 3.0: Disable failing cucumber suite for now
+
+* Tue Dec 29 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-1
+- 3.10.1
+
+* Fri Dec 11 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.0-1
+- Enable tests again
+
+* Fri Dec 11 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.0-0.1
+- 3.10.0
+- Once disable test for bootstrap
+
+* Wed Oct 14 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.3-1
+- 3.9.3
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun May  3 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.2-2
+- Enable cucumber test
+
+* Sun May  3 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.2-1
+- 3.9.2
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.1-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 30 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.1-1
+- 3.9.1
+
+* Tue Dec 10 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.0-2
+- Enable tests again
+
+* Tue Dec 10 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.0-0.1
+- 3.9.0
+- Once disable test for bootstrap
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.2-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 10 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.2-1
+- 3.8.2
+
+* Fri Jun 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.1-1
+- 3.8.1
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan  1 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.0-2
+- A Happy New Year
+- Suppress some test errors related to missing HOME env and real tty
+
+* Thu Dec 13 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.0-1
+- Enable tests again
+
+* Wed Dec 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.0-0.1
+- 3.8.0
+- Once disable test for bootstrap
+
+* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.7.1-3.2
+- Use C.UTF-8 locale
+  See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

 * Fri Feb 23 2018 Troy Dawson <tdawson@redhat.com> - 3.7.1-3
 - Update conditionals