3 changed files with 133 additions and 46 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/rspec-core-3.10.1.gem
-SOURCES/rubygem-rspec-core-3.10.1-full.tar.gz
+SOURCES/rspec-core-3.13.0.gem
+SOURCES/rubygem-rspec-core-3.13.0-full.tar.gz
--- a/.rubygem-rspec-core.metadata
+++ b/.rubygem-rspec-core.metadata
@ -1,2 +1,2 @@
-c462b4ecc1ff569a2d0019e7918d46f4d9086a8f SOURCES/rspec-core-3.10.1.gem
-2f23ead60f1e6b569eb148ade3c7de6c32b29a79 SOURCES/rubygem-rspec-core-3.10.1-full.tar.gz
+e311033c48a1e47184d4ce3615450ba08ad7a1b3 SOURCES/rspec-core-3.13.0.gem
+abee8c7fb6997e95e16957ffdbabbf97ec7f4933 SOURCES/rubygem-rspec-core-3.13.0-full.tar.gz
--- a/SPECS/rubygem-rspec-core.spec
+++ b/SPECS/rubygem-rspec-core.spec
@ -1,9 +1,9 @@
-%global	majorver	3.10.1
+%global	majorver	3.13.0
 #%%global	preminorver	.rc6
 %global	rpmminorver	.%(echo %preminorver | sed -e 's|^\\.\\.*||')
 %global	fullver	%{majorver}%{?preminorver}

-%global	fedorarel	7
+%global	baserelease	3

 %global	gem_name	rspec-core

@ -11,19 +11,24 @@
 # runtime part of rspec-mocks does not depend on rspec-core
 # Disable test for now due to cucumber v.s. gherkin dependency issue
 # pulled by aruba
-%global	need_bootstrap_set	0
+%bcond_with bootstrap

-# Disable Aruba support due to excesive dependency chain. This also disables
-# Cucumber integration test suite, which depends on Aruba as well.
-%bcond_with aruba
+# Disable Aruba support in RHEL due to excesive dependency chain. This also
+# disables Cucumber integration test suite, which depends on Aruba as well.
+%if ! 0%{?rhel}
+%bcond_without aruba
+%endif
+
+%undefine __brp_mangle_shebangs

 Summary:	RSpec runner and formatters
 Name:		rubygem-%{gem_name}
 Version:	%{majorver}
-Release:	%{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1
+Release:	%{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist}

+# SPDX confirmed
 License:	MIT
-URL:		http://github.com/rspec/rspec-mocks
+URL:		http://github.com/rspec/rspec-core
 Source0:	http://rubygems.org/gems/%{gem_name}-%{fullver}.gem
 # %%{SOURCE2} %%{name} %%{version}
 Source1:	rubygem-%{gem_name}-%{version}-full.tar.gz
@ -34,32 +39,35 @@ 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)
+%if %{without bootstrap}
+BuildRequires:	rubygem(minitest)
+BuildRequires:	rubygem(rake)
 BuildRequires:	rubygem(rspec)
+BuildRequires:	rubygem(test-unit)
+BuildRequires:	rubygem(coderay)
+BuildRequires:	rubygem(thread_order)
+BuildRequires:	git
+
 %if %{with aruba}
-BuildRequires: rubygem(aruba)
-# Newly
+BuildRequires:	rubygem(aruba)
 BuildRequires:	rubygem(flexmock)
 BuildRequires:	rubygem(mocha)
 BuildRequires:	rubygem(rr)
+BuildRequires:	rubygem(cucumber)
 %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
+# Make the following dependency optionally installed
 # lib/rspec/core/rake_task
+%if 0%{?fedora} >= 36
+Recommends:	rubygem(rake)
+%else
 Requires:	rubygem(rake)
+%endif
 # Optional
 #Requires:	rubygem(ZenTest)
 #Requires:	rubygem(flexmock)
@ -80,7 +88,7 @@ This package contains documentation for %{name}.

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

 %build
@ -94,11 +102,15 @@ cp -a .%{_prefix}/* %{buildroot}%{_prefix}/
 # cleanups
 rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts}

-%if 0%{?need_bootstrap_set} < 1
 %check
+%if %{with bootstrap}
+# Not do actual check, exiting.
+exit 0
+%endif
+
 LANG=C.UTF-8

-%if ! %{with aruba}
+%if %{without 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
@ -109,9 +121,28 @@ find spec/integration -exec truncate -s 0 {} \;
 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
+# ruby3.1: output format change, disabling for now
+sed -i spec/integration/spec_file_load_errors_spec.rb \
+	-e '\@nicely handles load-time errors in user spec files@s| it | xit |'
+
+# ruby3.2 + compile with YJIT + LTO seems to make rspec-core GC test fail.
+# disabling this, per ruby upsteram advice:
+# https://bugs.ruby-lang.org/issues/19254
+sed -i spec/rspec/core/example_spec.rb \
+	-e '\@defined.*RUBY_ENGINE.*truffleruby@s|^\(.*\)$|\1 \&\& false|'
+
+# RSpec uses only one thread local variable: disable for now
+sed -i spec/rspec/core_spec.rb \
+	-e '\@only one thread local variable@s| it | xit |'
+
+# FIXME seed 33413 sees test failure
+ruby -Ilib -S exe/rspec --seed 1 #33413
+
+%if %{without aruba}
+# The following lines are for cucumber tests, so exiting.
+exit 0
+%endif

-%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|'
@ -127,15 +158,26 @@ do
 done
 %endif

+# cucumber 7.0.0 does not support ~@
+sed -i cucumber.yml -e 's|~@wip|"not @wip"|'
+sed -i features/support/require_expect_syntax_in_aruba_specs.rb -e 's|~@|not @|g'
+# Perhaps with cucumber 7.0.0 change? (along with diff-lcs updated to 1.5)
+sed -i features/support/diff_lcs_versions.rb -e 's|scenario.title|scenario.name|'
+
 # 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/ \
+export CUCUMBER_PUBLISH_QUIET=true
+cucumber -v -f progress features/ || \
+	cucumber -v -f progress 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" \
+%if 0%{?fedora} >= 36
+	`# Cucumber 7 upgrades diff-lcs to 1.5` \
+	--tag "not @skip-when-diff-lcs-1.4" \
+%endif
 	--tag "not @ruby-2-7" \
 	%{nil}

@ -146,9 +188,6 @@ for f in  \
 do
 	mv ${f}.drop ${f}
 done
-%endif
-%endif
-
 %endif

 %files
@ -169,21 +208,69 @@ done
 %{gem_docdir}

 %changelog
-* 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
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.13.0-3
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.13.0-2
+- Bump release for June 2024 mass rebuild
+
+* Fri Feb 09 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.0-1
+- 3.13.0
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.2-3
+- Fix one failing test related to thread local variable
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Apr 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.2-1
+- 3.12.2
+
+* Fri Mar 03 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 3.12.1-2
+- Disable unwanted dependencies in RHEL builds
+
+* Fri Feb 10 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.1-1
+- 3.12.1
+
+* Thu Jan 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.0-2
+- Disable GC related test, with the advice from ruby upstream
+
+* Thu Oct 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.0-1
+- 3.12.0
+
+* Thu Sep 29 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.0-3
+- Backport upstream fix to eliminate Fixnum usage removed on Ruby 3.2
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.0-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun  6 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.0-2
+- Specify seed for rspec to avoid random failure for now
+
+* Thu Feb 10 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.0-1
+- 3.11.0
+
+* Fri Jan 28 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.2-2
+- Disable test failing on ruby31 for now
+
+* Fri Jan 28 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.2-1
+- 3.10.2
+
+* Fri Jan 28 2022 Vít Ondruch <vondruch@redhat.com>
+- Use weak dependency for Rake.

-* 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 Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-6.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* 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 Jan 14 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-6
+- Add some workaround for aruba 2 / cucumber 7 / diff-lcs 1.5

-* 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
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-5.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Thu Mar 18 2021 Vít Ondruch <vondruch@redhat.com> - 3.10.1-5
 - Make test suite green.