From 9bdeae148e6ecb10e7498b92b2a3fc9413a79255 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 07:00:09 +0000 Subject: [PATCH 01/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index b20298c..c9e4844 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -168,6 +168,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.9.2-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun May 3 2020 Mamoru TASAKA - 3.9.2-2 - Enable cucumber test From 473a7809ec432ca208e8a3e17e52f5d20e80dee4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 14 Oct 2020 11:38:21 +0900 Subject: [PATCH 02/55] 3.9.3 --- rubygem-rspec-core.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index c9e4844..2413c41 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.9.2 +%global majorver 3.9.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -143,8 +143,12 @@ sed -i features/core_standalone.feature \ sed -i features/command_line/init.feature \ -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' +# skip-when-diff-lcs-1.3 tests are introduced on 3.9.3 env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ - env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ --tag "not @broken" + env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ \ + --tag "not @broken" \ + --tag "not @skip-when-diff-lcs-1.3" \ + %{nil} mv lib/rspec/core/configuration_options.rb{.warn,} @@ -168,6 +172,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Wed Oct 14 2020 Mamoru TASAKA - 3.9.3-1 +- 3.9.3 + * Wed Jul 29 2020 Fedora Release Engineering - 3.9.2-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8869c098288cd26b8277d248758464a20da391cd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 14 Oct 2020 11:39:09 +0900 Subject: [PATCH 03/55] 3.9.3 --- .gitignore | 2 ++ sources | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ff42787..e410bdd 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ /rubygem-rspec-core-3.9.1-full.tar.gz /rspec-core-3.9.2.gem /rubygem-rspec-core-3.9.2-full.tar.gz +/rspec-core-3.9.3.gem +/rubygem-rspec-core-3.9.3-full.tar.gz diff --git a/sources b/sources index 8fb004e..34760f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.9.2.gem) = ee16ce312b47f2537479ef6a2c77d74c982108f029faa572125c95030e75e80934c00c07e918b63c075bdf78f9e912569e6a13ad78be217682fa7d06a2efc75f -SHA512 (rubygem-rspec-core-3.9.2-full.tar.gz) = 8ce6c1c6627f46e272f8926bea48925471fbfc97a3310d241b8b7d71870b7c162da7ebd322540bd4c99c7eb433a1c4de3b859fd31edc434c8fa7b04a11f5e378 +SHA512 (rspec-core-3.9.3.gem) = ef76cde69f3628cf88b40f12e86973754667c633b67917bbf2b523dbc02f7492cbf85145097463b831cac56e3a0446f4e38d8b5ca35753b8baec0d32af4f449b +SHA512 (rubygem-rspec-core-3.9.3-full.tar.gz) = a9e5dffaea1827247ebb28b440194e5ae794908feac780df1fbfa1879eb27aac9883ff4d9cf3ffc50ea9f47f9a63f05239c35877b8fcf00553a2d97ceb863e18 From b4d156aba5def5549047af3ccd8cf1c53c7b1fa5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 14 Oct 2020 11:39:53 +0900 Subject: [PATCH 04/55] fix release --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 2413c41..5735f29 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks From ae59d04825662289fcacd74c9bc5687bf7059863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 14 Oct 2020 15:38:37 +0200 Subject: [PATCH 05/55] Refresh the Summary and Description. --- rubygem-rspec-core.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 5735f29..9d5b2e6 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -15,7 +15,7 @@ %undefine __brp_mangle_shebangs -Summary: Rspec-2 runner and formatters +Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} @@ -62,7 +62,7 @@ Requires: 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} From d52086caa5e7e4f765914d29316de7c41e41f217 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 11 Dec 2020 14:44:20 +0900 Subject: [PATCH 06/55] 3.10.0 Once disable test for bootstrap --- .gitignore | 2 ++ rubygem-rspec-core.spec | 15 ++++++++++++--- sources | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e410bdd..050fc63 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ /rubygem-rspec-core-3.9.2-full.tar.gz /rspec-core-3.9.3.gem /rubygem-rspec-core-3.9.3-full.tar.gz +/rspec-core-3.10.0.gem +/rubygem-rspec-core-3.10.0-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 9d5b2e6..46ee459 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.9.3 +%global majorver 3.10.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 0.1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # 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 +%global need_bootstrap_set 1 %undefine __brp_mangle_shebangs @@ -171,7 +171,16 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %files doc %{gem_docdir} +%if 0 +* Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-1 +- Enable tests again +%endif + %changelog +* Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-0.1 +- 3.10.0 +- Once disable test for bootstrap + * Wed Oct 14 2020 Mamoru TASAKA - 3.9.3-1 - 3.9.3 diff --git a/sources b/sources index 34760f4..1821954 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.9.3.gem) = ef76cde69f3628cf88b40f12e86973754667c633b67917bbf2b523dbc02f7492cbf85145097463b831cac56e3a0446f4e38d8b5ca35753b8baec0d32af4f449b -SHA512 (rubygem-rspec-core-3.9.3-full.tar.gz) = a9e5dffaea1827247ebb28b440194e5ae794908feac780df1fbfa1879eb27aac9883ff4d9cf3ffc50ea9f47f9a63f05239c35877b8fcf00553a2d97ceb863e18 +SHA512 (rspec-core-3.10.0.gem) = 38f11cad8d3fe31d5a1b1539c82211ec704efabfc42ac1c2da2b3e110fab047576b4f51618bf917df162c766d31a56155b34732116b90d9a5c93efd1ddf82eb6 +SHA512 (rubygem-rspec-core-3.10.0-full.tar.gz) = 41ac3be87e90d2fe61b6c7ba17f186864c9908ceb33748802272adf6f5ffb03e01a0c2a2655b70396da25dba5d72d2df8a59be7440ec5dc1040254cb2b5f06f5 From 131231b2e0ea93f19ba8e1a09f274233b28ce8f5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 11 Dec 2020 15:30:39 +0900 Subject: [PATCH 07/55] Enable tests again --- rubygem-rspec-core.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 46ee459..a6fafc6 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 0.1 +%global fedorarel 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # 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 1 +%global need_bootstrap_set 0 %undefine __brp_mangle_shebangs @@ -171,12 +171,10 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %files doc %{gem_docdir} -%if 0 +%changelog * Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-1 - Enable tests again -%endif -%changelog * Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-0.1 - 3.10.0 - Once disable test for bootstrap From f9d9b5b42721c0a9eff24d1f8f248a6801d1543d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 29 Dec 2020 15:15:29 +0900 Subject: [PATCH 08/55] 3.10.1 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 050fc63..bfb6406 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,5 @@ /rubygem-rspec-core-3.9.3-full.tar.gz /rspec-core-3.10.0.gem /rubygem-rspec-core-3.10.0-full.tar.gz +/rspec-core-3.10.1.gem +/rubygem-rspec-core-3.10.1-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index a6fafc6..67e8909 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.10.0 +%global majorver 3.10.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -172,6 +172,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Tue Dec 29 2020 Mamoru TASAKA - 3.10.1-1 +- 3.10.1 + * Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-1 - Enable tests again diff --git a/sources b/sources index 1821954..b5f9982 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.10.0.gem) = 38f11cad8d3fe31d5a1b1539c82211ec704efabfc42ac1c2da2b3e110fab047576b4f51618bf917df162c766d31a56155b34732116b90d9a5c93efd1ddf82eb6 -SHA512 (rubygem-rspec-core-3.10.0-full.tar.gz) = 41ac3be87e90d2fe61b6c7ba17f186864c9908ceb33748802272adf6f5ffb03e01a0c2a2655b70396da25dba5d72d2df8a59be7440ec5dc1040254cb2b5f06f5 +SHA512 (rspec-core-3.10.1.gem) = 46808d37736b5f30d562b4014638cbf2d1a7d7432730c6c727a6e539f63ee21a04185610034fff4d938a948a887ba6a626955963add6b5e9b5f64499732d742a +SHA512 (rubygem-rspec-core-3.10.1-full.tar.gz) = 50557bc17f7f47986d5770d02c85536a44666f6eafed168df41740fcfa4ded5ee5d11a933d2d25614a532948c91cb5ebdc7eaf45b5e8c7f792870eb203e00527 From bf7eedcab7a5b419d9e3702adf2084335a62a9bf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 26 Jan 2021 11:50:33 +0900 Subject: [PATCH 09/55] Ruby 3.0: Disable failing cucumber suite for now --- rubygem-rspec-core.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 67e8909..a07906e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -74,6 +74,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 +#%%patch1 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -143,6 +144,11 @@ sed -i features/core_standalone.feature \ sed -i features/command_line/init.feature \ -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' +# From ruby 3, once disabling +%if 0%{?fedora} >= 34 +mv features/command_line/warnings_option.feature{,.drop} +%endif + # skip-when-diff-lcs-1.3 tests are introduced on 3.9.3 env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ \ @@ -152,6 +158,11 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ mv lib/rspec/core/configuration_options.rb{.warn,} +%if 0%{?fedora} >= 34 +mv features/command_line/warnings_option.feature{.drop,} + +%endif + %endif %files @@ -172,6 +183,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Tue Jan 26 2021 Mamoru TASAKA - 3.10.1-2 +- Ruby 3.0: Disable failing cucumber suite for now + * Tue Dec 29 2020 Mamoru TASAKA - 3.10.1-1 - 3.10.1 From 190fb4d37ddf57aaf195ae1094dc338748fd2795 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 17 Feb 2021 16:51:39 +0900 Subject: [PATCH 10/55] rr 1.2.1: Disable failing cucumber suite for now --- rubygem-rspec-core.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index a07906e..3779c64 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 3 %global gem_name rspec-core @@ -145,8 +145,15 @@ sed -i features/command_line/init.feature \ -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' # From ruby 3, once disabling +# disabling tests failing with rr 1.2.1 %if 0%{?fedora} >= 34 -mv features/command_line/warnings_option.feature{,.drop} +for f in \ + features/command_line/warnings_option.feature \ + features/mock_framework_integration/use_rr.feature \ + %{nil} +do + mv $f ${f}.drop +done %endif # skip-when-diff-lcs-1.3 tests are introduced on 3.9.3 @@ -159,8 +166,13 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ mv lib/rspec/core/configuration_options.rb{.warn,} %if 0%{?fedora} >= 34 -mv features/command_line/warnings_option.feature{.drop,} - +for f in \ + features/command_line/warnings_option.feature \ + features/mock_framework_integration/use_rr.feature \ + %{nil} +do + mv ${f}.drop ${f} +done %endif %endif @@ -183,6 +195,9 @@ mv features/command_line/warnings_option.feature{.drop,} %{gem_docdir} %changelog +* Wed Feb 17 2021 Mamoru TASAKA - 3.10.1-3 +- rr 1.2.1: Disable failing cucumber suite for now + * Tue Jan 26 2021 Mamoru TASAKA - 3.10.1-2 - Ruby 3.0: Disable failing cucumber suite for now From b7fcc5214d1f7cdc380666daaef8abd65dbcd4e6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Feb 2021 17:09:20 +0900 Subject: [PATCH 11/55] add conditional for eln, to shut down build failure automatically evoked so many time... --- rubygem-rspec-core.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 3779c64..20c18cf 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 4 %global gem_name rspec-core @@ -146,7 +146,7 @@ sed -i features/command_line/init.feature \ # From ruby 3, once disabling # disabling tests failing with rr 1.2.1 -%if 0%{?fedora} >= 34 +%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ features/command_line/warnings_option.feature \ features/mock_framework_integration/use_rr.feature \ @@ -165,7 +165,7 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ mv lib/rspec/core/configuration_options.rb{.warn,} -%if 0%{?fedora} >= 34 +%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ features/command_line/warnings_option.feature \ features/mock_framework_integration/use_rr.feature \ @@ -195,6 +195,9 @@ done %{gem_docdir} %changelog +* Sun Feb 28 2021 Mamoru TASAKA - 3.10.1-4 +- Add conditional for eln + * Wed Feb 17 2021 Mamoru TASAKA - 3.10.1-3 - rr 1.2.1: Disable failing cucumber suite for now From eb160dab1204d221c567d772d62412169b2f2a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 18 Mar 2021 16:31:02 +0100 Subject: [PATCH 12/55] Make test suite green. --- ...0.1-Filter-content-of-usr-share-ruby.patch | 28 +++++++++ rubygem-rspec-core.spec | 61 ++++--------------- 2 files changed, 40 insertions(+), 49 deletions(-) create mode 100644 rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch diff --git a/rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch b/rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch new file mode 100644 index 0000000..fa7e8ac --- /dev/null +++ b/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?= +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 + diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 20c18cf..77cc9d4 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 4 +%global fedorarel 5 %global gem_name rspec-core @@ -26,6 +26,9 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{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 @@ -74,7 +77,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 -#%%patch1 -p1 +%patch0 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -91,52 +94,11 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %if 0%{?need_bootstrap_set} < 1 %check LANG=C.UTF-8 -# Test failure needs investigation... -# perhaps due to some incompatibility between libxml2 2.9.x -# and rubygem-nokogiri +# 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 -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") -# New from 3.9.0 -FAILFILE+=("spec/integration/spec_file_load_errors_spec.rb") -FAILTEST+=("prints a single error when it happens") - -for ((i = 0; i < ${#FAILFILE[@]}; i++)) { - sed -i \ - -e "\@${FAILTEST[$i]}@s|do$|, :broken => true do|" \ - ${FAILFILE[$i]} -} - - -# Well, when HOME variable is not set and tty is not a real one -# but pseudo-tty, with current ruby implementation $ env -i ruby -e 'p Dir.home' -# causes: -# `home': couldn't find login name -- expanding `~' (ArgumentError) -# - and this causes some test errors on rspec-core. -# fixing this error without modifying rspec-core "code" is very hard, -# once modifying source itself. -sed -i.warn lib/rspec/core/configuration_options.rb \ - -e '\@because the HOME environment variable is not set@s|RSpec\.warning|#RSpec.warning|' - -ruby -rrubygems -Ilib/ -S exe/rspec || \ - ruby -rrubygems -Ilib/ -S exe/rspec --tag ~broken +ruby -rrubygems -Ilib/ -S exe/rspec # Mark failing test as broken sed -i features/core_standalone.feature \ @@ -163,8 +125,6 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ --tag "not @skip-when-diff-lcs-1.3" \ %{nil} -mv lib/rspec/core/configuration_options.rb{.warn,} - %if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ features/command_line/warnings_option.feature \ @@ -195,6 +155,9 @@ done %{gem_docdir} %changelog +* Thu Mar 18 2021 Vít Ondruch - 3.10.1-5 +- Make test suite green. + * Sun Feb 28 2021 Mamoru TASAKA - 3.10.1-4 - Add conditional for eln From 5b507733ac6be2ede3bdf622baa494edd233f30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 18 Mar 2021 17:13:05 +0100 Subject: [PATCH 13/55] Drop Nokogiri dependency. It does not appear to be used anywhere. --- rubygem-rspec-core.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 77cc9d4..696ffd8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -34,7 +34,6 @@ Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch BuildRequires: rubygems-devel %if 0%{?need_bootstrap_set} < 1 BuildRequires: rubygem(minitest) -BuildRequires: rubygem(nokogiri) BuildRequires: rubygem(rake) BuildRequires: rubygem(rspec) BuildRequires: rubygem(aruba) From 4bceaf8eda7add9cecce8a7b8c836af348d8ab90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 19 Mar 2021 15:02:26 +0100 Subject: [PATCH 14/55] Polish the cucumber test suite. --- rubygem-rspec-core.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 696ffd8..1e6c85a 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -100,16 +100,13 @@ sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ ruby -rrubygems -Ilib/ -S exe/rspec # Mark failing test as broken -sed -i features/core_standalone.feature \ - -e 's|@unsupported-on-rbx|@unsupported-on-rbx @broken|' sed -i features/command_line/init.feature \ - -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' + -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' -# From ruby 3, once disabling -# disabling tests failing with rr 1.2.1 %if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ - features/command_line/warnings_option.feature \ + `# 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 @@ -117,16 +114,20 @@ do done %endif -# skip-when-diff-lcs-1.3 tests are introduced on 3.9.3 -env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ - env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ \ +# 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/command_line/warnings_option.feature \ features/mock_framework_integration/use_rr.feature \ %{nil} do From fb330069ff5e93e853c53fc62a62314fec87ee8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 12:37:27 +0000 Subject: [PATCH 15/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 1e6c85a..3744e77 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ 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 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -155,6 +155,9 @@ done %{gem_docdir} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.10.1-5.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 18 2021 Vít Ondruch - 3.10.1-5 - Make test suite green. From b1e371f3020839b011e880cc04d4e27214fa2829 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Jan 2022 19:49:58 +0900 Subject: [PATCH 16/55] Add some workaround for aruba 2 / cucumber 7 / diff-lcs 1.5 --- rubygem-rspec-core.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 3744e77..ee6c19f 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 5 +%global fedorarel 6 %global gem_name rspec-core @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -97,7 +97,7 @@ LANG=C.UTF-8 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 +ruby -Ilib -S exe/rspec # Mark failing test as broken sed -i features/command_line/init.feature \ @@ -114,8 +114,15 @@ 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(?:)')" +export CUCUMBER_PUBLISH_QUIET=true cucumber -v -f pretty features/ || \ cucumber -v -f pretty features/ \ --tag "not @broken" \ @@ -123,6 +130,10 @@ cucumber -v -f pretty features/ || \ `# 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} @@ -155,6 +166,9 @@ done %{gem_docdir} %changelog +* Fri Jan 14 2022 Mamoru TASAKA - 3.10.1-6 +- Add some workaround for aruba 2 / cucumber 7 / diff-lcs 1.5 + * Fri Jul 23 2021 Fedora Release Engineering - 3.10.1-5.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 490e7cfdd5fdd6a1e0dd33f543c839d3f48a4015 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 19:10:57 +0000 Subject: [PATCH 17/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index ee6c19f..f8b3565 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ 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 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -166,6 +166,9 @@ done %{gem_docdir} %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.10.1-6.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 Mamoru TASAKA - 3.10.1-6 - Add some workaround for aruba 2 / cucumber 7 / diff-lcs 1.5 From 15e3de8d5ccf32c7199d9f39e45d536fa6159a48 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 10:45:29 +0900 Subject: [PATCH 18/55] vondruch: Use weak dependency for Rake --- rubygem-rspec-core.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index f8b3565..6f4fffd 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -53,9 +53,13 @@ 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) @@ -166,6 +170,9 @@ done %{gem_docdir} %changelog +* Fri Jan 28 2021 Vít Ondruch +- Use weak dependency for Rake. + * Fri Jan 21 2022 Fedora Release Engineering - 3.10.1-6.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From dac52cb61d7fc51f3871bb5dc60dd083e9ff576a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 11:02:07 +0900 Subject: [PATCH 19/55] 3.10.2 --- .gitignore | 69 ++--------------------------------------- rubygem-rspec-core.spec | 9 ++++-- 2 files changed, 8 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index bfb6406..b9f8553 100644 --- a/.gitignore +++ b/.gitignore @@ -1,67 +1,2 @@ -/rspec-core-2.5.1.gem -/rspec-core-2.6.0.rc4.gem -/rspec-core-2.6.0.rc6.gem -/rspec-core-2.6.0.gem -/rspec-core-2.6.2.gem -/rspec-core-2.6.3.gem -/rspec-core-2.6.4.gem -/rspec-core-2.8.0.gem -/rspec-core-2.11.1.gem -/rspec-core-2.12.2.gem -/rspec-core-2.13.1.gem -/rspec-core-2.14.5.gem -/rspec-core-2.14.6.gem -/rspec-core-2.14.7.gem -/rspec-core-2.14.8.gem -/rspec-core-3.1.7.gem -/rubygem-rspec-core-3.1.7-full.tar.gz -/rspec-core-3.2.0.gem -/rubygem-rspec-core-3.2.0-full.tar.gz -/rspec-core-3.2.1.gem -/rubygem-rspec-core-3.2.1-full.tar.gz -/rspec-core-3.2.2.gem -/rubygem-rspec-core-3.2.2-full.tar.gz -/rspec-core-3.2.3.gem -/rubygem-rspec-core-3.2.3-full.tar.gz -/rspec-core-3.3.2.gem -/rubygem-rspec-core-3.3.2-full.tar.gz -/rspec-core-3.4.1.gem -/rubygem-rspec-core-3.4.1-full.tar.gz -/rspec-core-3.4.2.gem -/rubygem-rspec-core-3.4.2-full.tar.gz -/rspec-core-3.4.3.gem -/rubygem-rspec-core-3.4.3-full.tar.gz -/rspec-core-3.4.4.gem -/rubygem-rspec-core-3.4.4-full.tar.gz -/rspec-core-3.5.1.gem -/rubygem-rspec-core-3.5.1-full.tar.gz -/rspec-core-3.5.2.gem -/rubygem-rspec-core-3.5.2-full.tar.gz -/rspec-core-3.5.3.gem -/rubygem-rspec-core-3.5.3-full.tar.gz -/rspec-core-3.5.4.gem -/rubygem-rspec-core-3.5.4-full.tar.gz -/rspec-core-3.6.0.gem -/rubygem-rspec-core-3.6.0-full.tar.gz -/rspec-core-3.7.0.gem -/rubygem-rspec-core-3.7.0-full.tar.gz -/rspec-core-3.7.1.gem -/rubygem-rspec-core-3.7.1-full.tar.gz -/rspec-core-3.8.0.gem -/rubygem-rspec-core-3.8.0-full.tar.gz -/rspec-core-3.8.1.gem -/rubygem-rspec-core-3.8.1-full.tar.gz -/rspec-core-3.8.2.gem -/rubygem-rspec-core-3.8.2-full.tar.gz -/rspec-core-3.9.0.gem -/rubygem-rspec-core-3.9.0-full.tar.gz -/rspec-core-3.9.1.gem -/rubygem-rspec-core-3.9.1-full.tar.gz -/rspec-core-3.9.2.gem -/rubygem-rspec-core-3.9.2-full.tar.gz -/rspec-core-3.9.3.gem -/rubygem-rspec-core-3.9.3-full.tar.gz -/rspec-core-3.10.0.gem -/rubygem-rspec-core-3.10.0-full.tar.gz -/rspec-core-3.10.1.gem -/rubygem-rspec-core-3.10.1-full.tar.gz +/rspec-core-*.gem +/rubygem-rspec-core-*-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 6f4fffd..3f6df0e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.10.1 +%global majorver 3.10.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 6 +%global fedorarel 1 %global gem_name rspec-core @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -170,6 +170,9 @@ done %{gem_docdir} %changelog +* Fri Jan 28 2021 Mamoru TASAKA - 3.10.2-1 +- 3.10.2 + * Fri Jan 28 2021 Vít Ondruch - Use weak dependency for Rake. From b77cdbbdac0ee1e7e89d331f0a287a1b227fab1d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 11:03:23 +0900 Subject: [PATCH 20/55] upload source --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b5f9982..5a68b1e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.10.1.gem) = 46808d37736b5f30d562b4014638cbf2d1a7d7432730c6c727a6e539f63ee21a04185610034fff4d938a948a887ba6a626955963add6b5e9b5f64499732d742a -SHA512 (rubygem-rspec-core-3.10.1-full.tar.gz) = 50557bc17f7f47986d5770d02c85536a44666f6eafed168df41740fcfa4ded5ee5d11a933d2d25614a532948c91cb5ebdc7eaf45b5e8c7f792870eb203e00527 +SHA512 (rspec-core-3.10.2.gem) = ce35b247be7b5cc656febda685021f18b5e752b865d8815ac4ac1fd1de05b3d7f8bca97c8183afa5395f0acf59a0725037ecd887e319f566a0b1d55140d2119c +SHA512 (rubygem-rspec-core-3.10.2-full.tar.gz) = 6329fc1de12f7044201d4cc5170e50d6342b3ec9c4ccbbb5dba01edbf556f20467b2a41a2578e28b71b375dde512bc9a7b5088785abe0a5f2f297007e68624f9 From b29f846a30c22cda852881b89b2a7cc29535e7ee Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 11:09:00 +0900 Subject: [PATCH 21/55] fix year --- rubygem-rspec-core.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 3f6df0e..c734a64 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -170,10 +170,10 @@ done %{gem_docdir} %changelog -* Fri Jan 28 2021 Mamoru TASAKA - 3.10.2-1 +* Fri Jan 28 2022 Mamoru TASAKA - 3.10.2-1 - 3.10.2 -* Fri Jan 28 2021 Vít Ondruch +* Fri Jan 28 2022 Vít Ondruch - Use weak dependency for Rake. * Fri Jan 21 2022 Fedora Release Engineering - 3.10.1-6.1 From c0be2aa6eaaa7099248826ca12e2a8d036c81cf8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 13:14:03 +0900 Subject: [PATCH 22/55] Disable test failing on ruby31 for now --- rubygem-rspec-core.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index c734a64..f4b6138 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -101,6 +101,10 @@ LANG=C.UTF-8 sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ spec/integration/{suite_hooks_errors,spec_file_load_errors}_spec.rb +# 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 |' + ruby -Ilib -S exe/rspec # Mark failing test as broken @@ -170,6 +174,9 @@ done %{gem_docdir} %changelog +* Fri Jan 28 2022 Mamoru TASAKA - 3.10.2-2 +- Disable test failing on ruby31 for now + * Fri Jan 28 2022 Mamoru TASAKA - 3.10.2-1 - 3.10.2 From 35c7273f1ae095a76499b4a04e8d535088d0315d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 10 Feb 2022 12:32:21 +0900 Subject: [PATCH 23/55] 3.11.0 --- rubygem-rspec-core.spec | 13 ++++++++----- sources | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index f4b6138..3da0a19 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.10.2 +%global majorver 3.11.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # 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_without bootstrap %undefine __brp_mangle_shebangs @@ -32,7 +32,7 @@ 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 +%if %{without bootstrap} BuildRequires: rubygem(minitest) BuildRequires: rubygem(rake) BuildRequires: rubygem(rspec) @@ -94,8 +94,8 @@ cp -a .%{_prefix}/* %{buildroot}%{_prefix}/ # cleanups rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} -%if 0%{?need_bootstrap_set} < 1 %check +%if %{without bootstrap} LANG=C.UTF-8 # Adjust the backtrace filters to our directory layout. sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ @@ -174,6 +174,9 @@ done %{gem_docdir} %changelog +* Thu Feb 10 2022 Mamoru TASAKA - 3.11.0-1 +- 3.11.0 + * Fri Jan 28 2022 Mamoru TASAKA - 3.10.2-2 - Disable test failing on ruby31 for now diff --git a/sources b/sources index 5a68b1e..ee80b34 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.10.2.gem) = ce35b247be7b5cc656febda685021f18b5e752b865d8815ac4ac1fd1de05b3d7f8bca97c8183afa5395f0acf59a0725037ecd887e319f566a0b1d55140d2119c -SHA512 (rubygem-rspec-core-3.10.2-full.tar.gz) = 6329fc1de12f7044201d4cc5170e50d6342b3ec9c4ccbbb5dba01edbf556f20467b2a41a2578e28b71b375dde512bc9a7b5088785abe0a5f2f297007e68624f9 +SHA512 (rspec-core-3.11.0.gem) = 2cec4af0ac69776a4846ef93e98f5459e346b22b9f118aa3fb65c71b8fcecd3d6d156ffba0a6509fb11c9d9e3d88badcece23055e4f3ea0f4ef6e867372fc9b9 +SHA512 (rubygem-rspec-core-3.11.0-full.tar.gz) = b21894403df5bdb7a0456b490cf69c42ecdda54a3dcfd64f91d2ca7d63a339e1b08f595bfa8612ce49f718db526f63acda44bff11ae13a58ba8edfe0cacdcfdc From 667932f2401612c24b3f2b0425bb3785b3c1b7f6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 10 Feb 2022 13:23:49 +0900 Subject: [PATCH 24/55] kill bootstrap --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 3da0a19..51f183e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -11,7 +11,7 @@ # 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 -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 2944f7f50ae0a15c5a7e97cd4b431222c41497a9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Jun 2022 12:27:33 +0900 Subject: [PATCH 25/55] Specify seed for rspec to avoid random failure for now --- rubygem-rspec-core.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 51f183e..70f16ea 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -105,7 +105,8 @@ sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ sed -i spec/integration/spec_file_load_errors_spec.rb \ -e '\@nicely handles load-time errors in user spec files@s| it | xit |' -ruby -Ilib -S exe/rspec +# FIXME seed 33413 sees test failure +ruby -Ilib -S exe/rspec --seed 1 #33413 # Mark failing test as broken sed -i features/command_line/init.feature \ @@ -131,8 +132,8 @@ 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(?:)')" export CUCUMBER_PUBLISH_QUIET=true -cucumber -v -f pretty features/ || \ - cucumber -v -f pretty features/ \ +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` \ @@ -174,6 +175,9 @@ done %{gem_docdir} %changelog +* Mon Jun 6 2022 Mamoru TASAKA - 3.11.0-2 +- Specify seed for rspec to avoid random failure for now + * Thu Feb 10 2022 Mamoru TASAKA - 3.11.0-1 - 3.11.0 From 3d3ffc664307bf24f1e203fbb678779d21eb831c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 02:12:59 +0000 Subject: [PATCH 26/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 70f16ea..b3d3ead 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ 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 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -175,6 +175,9 @@ done %{gem_docdir} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 6 2022 Mamoru TASAKA - 3.11.0-2 - Specify seed for rspec to avoid random failure for now From e7531e5398dc0d81fbcdcb9c7b26fb83e009a2e0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 Sep 2022 23:06:37 +0900 Subject: [PATCH 27/55] Backport upstream fix to eliminate Fixnum usage removed on Ruby 3.2 --- rubygem-rspec-core.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index b3d3ead..33c922d 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 3 %global gem_name rspec-core @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -83,6 +83,11 @@ This package contains documentation for %{name}. %patch0 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec +# https://github.com/ruby/ruby/blob/28840d74c26189f4e730b906c2383e32ea6165fe/NEWS.md?plain=1#L232 +# https://github.com/rspec/rspec-core/commit/bf49c78d7a92e253d557924a3f85fd6991e32ca3 +# Ruby 3.2 removes Fixnum +sed -i features/metadata/described_class.feature -e 's|Fixnum|Symbol|' + %build gem build %{gem_name}.gemspec %gem_install @@ -175,6 +180,9 @@ done %{gem_docdir} %changelog +* Thu Sep 29 2022 Mamoru TASAKA - 3.11.0-3 +- Backport upstream fix to eliminate Fixnum usage removed on Ruby 3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 81232177c09385056d38ffc54836e4b29398e80d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 15:38:32 +0900 Subject: [PATCH 28/55] 3.12.0 --- rubygem-rspec-core.spec | 16 +++++++--------- sources | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 33c922d..250fb99 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.11.0 +%global majorver 3.12.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # 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 -%bcond_with bootstrap +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -83,11 +83,6 @@ This package contains documentation for %{name}. %patch0 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec -# https://github.com/ruby/ruby/blob/28840d74c26189f4e730b906c2383e32ea6165fe/NEWS.md?plain=1#L232 -# https://github.com/rspec/rspec-core/commit/bf49c78d7a92e253d557924a3f85fd6991e32ca3 -# Ruby 3.2 removes Fixnum -sed -i features/metadata/described_class.feature -e 's|Fixnum|Symbol|' - %build gem build %{gem_name}.gemspec %gem_install @@ -129,7 +124,7 @@ done %endif # cucumber 7.0.0 does not support ~@ -sed -i cucumber.yml -e "s|~@wip|'not @wip'|" +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|' @@ -180,6 +175,9 @@ done %{gem_docdir} %changelog +* Thu Oct 27 2022 Mamoru TASAKA - 3.12.0-1 +- 3.12.0 + * Thu Sep 29 2022 Mamoru TASAKA - 3.11.0-3 - Backport upstream fix to eliminate Fixnum usage removed on Ruby 3.2 diff --git a/sources b/sources index ee80b34..254ead7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.11.0.gem) = 2cec4af0ac69776a4846ef93e98f5459e346b22b9f118aa3fb65c71b8fcecd3d6d156ffba0a6509fb11c9d9e3d88badcece23055e4f3ea0f4ef6e867372fc9b9 -SHA512 (rubygem-rspec-core-3.11.0-full.tar.gz) = b21894403df5bdb7a0456b490cf69c42ecdda54a3dcfd64f91d2ca7d63a339e1b08f595bfa8612ce49f718db526f63acda44bff11ae13a58ba8edfe0cacdcfdc +SHA512 (rspec-core-3.12.0.gem) = b6b990fb9663474b899423da113fc590c8de990c74852e9022b026f1ea97c93a31f207fbb67e756bc20e79b539a2324ffa8ebe277b27f902619501d00beae96b +SHA512 (rubygem-rspec-core-3.12.0-full.tar.gz) = 086f5e63e288a70c2d8cb8f10a5f71b02b9a5de1fe0157016c1744d28257f5b64b188058914e7986af791a494b3efa6afdf17d1d6132bddf03d3b525561ae516 From 0e470ac484e50da18c936e411ca58b45b558a39c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 16:02:37 +0900 Subject: [PATCH 29/55] enable test again --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 250fb99..f870628 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -11,7 +11,7 @@ # 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 -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 91ba64084bf402b532a122ef044f207c08fad376 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 19 Jan 2023 10:28:07 +0900 Subject: [PATCH 30/55] Disable GC related test, with the advice from ruby upstream --- rubygem-rspec-core.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index f870628..2b064f6 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -105,6 +105,12 @@ sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ 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|' + # FIXME seed 33413 sees test failure ruby -Ilib -S exe/rspec --seed 1 #33413 @@ -175,6 +181,9 @@ done %{gem_docdir} %changelog +* Thu Jan 19 2023 Mamoru TASAKA - 3.12.0-2 +- Disable GC related test, with the advice from ruby upstream + * Thu Oct 27 2022 Mamoru TASAKA - 3.12.0-1 - 3.12.0 From c90c3940f344f18bcb75c37e58071e2ac85b5715 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 10 Feb 2023 14:26:20 +0900 Subject: [PATCH 31/55] 3.12.1 --- rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 2b064f6..c8e1682 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.12.0 +%global majorver 3.12.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -181,6 +181,9 @@ done %{gem_docdir} %changelog +* Fri Feb 10 2023 Mamoru TASAKA - 3.12.1-1 +- 3.12.1 + * Thu Jan 19 2023 Mamoru TASAKA - 3.12.0-2 - Disable GC related test, with the advice from ruby upstream diff --git a/sources b/sources index 254ead7..0440561 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.12.0.gem) = b6b990fb9663474b899423da113fc590c8de990c74852e9022b026f1ea97c93a31f207fbb67e756bc20e79b539a2324ffa8ebe277b27f902619501d00beae96b -SHA512 (rubygem-rspec-core-3.12.0-full.tar.gz) = 086f5e63e288a70c2d8cb8f10a5f71b02b9a5de1fe0157016c1744d28257f5b64b188058914e7986af791a494b3efa6afdf17d1d6132bddf03d3b525561ae516 +SHA512 (rspec-core-3.12.1.gem) = 986d19437c223511293094c0ad041d565cb78cdb5ecce0995bac963b9c27a4b346d914c7625ba4a6021cd8c64b8218aaf0788ce617b05adeb0f889565191e8c2 +SHA512 (rubygem-rspec-core-3.12.1-full.tar.gz) = 9cbce3e06d7645e16ea78944e4be32adae134f9037951232d72fa6d7e4140285737e49e0c494a076bf479cebccbfdf2fb1321156fe1821ee1404dd2d335bf2ba From f3fc1e2f77715e2a81f5db55db567ace98f3826b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 3 Mar 2023 13:54:34 -0500 Subject: [PATCH 32/55] Disable unwanted dependencies in RHEL builds --- rubygem-rspec-core.spec | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index c8e1682..832a2e8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -13,6 +13,12 @@ # pulled by aruba %bcond_with bootstrap +# 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 @@ -36,17 +42,18 @@ BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) BuildRequires: rubygem(rake) BuildRequires: rubygem(rspec) -BuildRequires: rubygem(aruba) -# Newly -BuildRequires: rubygem(flexmock) -BuildRequires: rubygem(mocha) -BuildRequires: rubygem(rr) +BuildRequires: rubygem(test-unit) BuildRequires: rubygem(coderay) BuildRequires: rubygem(thread_order) BuildRequires: git -# New test + +%if %{with aruba} +BuildRequires: rubygem(aruba) +BuildRequires: rubygem(flexmock) +BuildRequires: rubygem(mocha) +BuildRequires: rubygem(rr) BuildRequires: rubygem(cucumber) -BuildRequires: rubygem(test-unit) +%endif %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: glibc-langpack-en @@ -97,6 +104,14 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %check %if %{without bootstrap} LANG=C.UTF-8 + +%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 +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 @@ -114,6 +129,8 @@ sed -i spec/rspec/core/example_spec.rb \ # FIXME seed 33413 sees test failure ruby -Ilib -S exe/rspec --seed 1 #33413 +%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|' @@ -163,6 +180,8 @@ done %endif +%endif + %files %dir %{gem_instdir} @@ -181,6 +200,9 @@ done %{gem_docdir} %changelog +* Fri Mar 03 2023 Yaakov Selkowitz - 3.12.1-2 +- Disable unwanted dependencies in RHEL builds + * Fri Feb 10 2023 Mamoru TASAKA - 3.12.1-1 - 3.12.1 From 49cabb4d953ce69045b0ac4b9a0077aac8486c1a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 9 Mar 2023 16:20:27 +0900 Subject: [PATCH 33/55] refactor: do early exit and avoid looong if conditional --- rubygem-rspec-core.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 832a2e8..dcce0c3 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -102,7 +102,11 @@ cp -a .%{_prefix}/* %{buildroot}%{_prefix}/ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %check -%if %{without bootstrap} +%if %{with bootstrap} +# Not do actual check, exiting. +exit 0 +%endif + LANG=C.UTF-8 %if %{without aruba} @@ -129,7 +133,10 @@ sed -i spec/rspec/core/example_spec.rb \ # FIXME seed 33413 sees test failure ruby -Ilib -S exe/rspec --seed 1 #33413 -%if %{with aruba} +%if %{without aruba} +# The following lines are for cucumber tests, so exiting. +exit 0 +%endif # Mark failing test as broken sed -i features/command_line/init.feature \ @@ -178,10 +185,6 @@ do done %endif -%endif - -%endif - %files %dir %{gem_instdir} From be8457ed9ab795369829575092802797d3812855 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:35:59 +0900 Subject: [PATCH 34/55] rename release macro to make rpmdev-bumprelease work --- rubygem-rspec-core.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index dcce0c3..82d66af 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global baserelease 2 %global gem_name rspec-core @@ -24,7 +24,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks From 9bdc5922e0e3522955535169fb32cc23c6b371f0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 Mar 2023 20:13:56 +0900 Subject: [PATCH 35/55] SPDX confirmed --- rubygem-rspec-core.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 82d66af..cfa8ce8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -26,6 +26,7 @@ Name: rubygem-%{gem_name} Version: %{majorver} Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} +# SPDX confirmed License: MIT URL: http://github.com/rspec/rspec-mocks Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem From eeb80ca9f028b1b9e294d2ea87fa4bd961b284ec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 Mar 2023 20:14:55 +0900 Subject: [PATCH 36/55] fix URL --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index cfa8ce8..ce026a0 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -28,7 +28,7 @@ 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 From 8e8ad95bf1daf70fcf39619ef652831555bd97a7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 19 Apr 2023 17:14:51 +0900 Subject: [PATCH 37/55] 3.12.2 --- rubygem-rspec-core.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index ce026a0..199da28 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.12.1 +%global majorver 3.12.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 1 %global gem_name rspec-core @@ -88,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 @@ -204,6 +204,9 @@ done %{gem_docdir} %changelog +* Wed Apr 19 2023 Mamoru TASAKA - 3.12.2-1 +- 3.12.2 + * Fri Mar 03 2023 Yaakov Selkowitz - 3.12.1-2 - Disable unwanted dependencies in RHEL builds diff --git a/sources b/sources index 0440561..06fb890 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.12.1.gem) = 986d19437c223511293094c0ad041d565cb78cdb5ecce0995bac963b9c27a4b346d914c7625ba4a6021cd8c64b8218aaf0788ce617b05adeb0f889565191e8c2 -SHA512 (rubygem-rspec-core-3.12.1-full.tar.gz) = 9cbce3e06d7645e16ea78944e4be32adae134f9037951232d72fa6d7e4140285737e49e0c494a076bf479cebccbfdf2fb1321156fe1821ee1404dd2d335bf2ba +SHA512 (rspec-core-3.12.2.gem) = b798d0624eb53ca866a76cac74885bfb37a2715d21346e097c0a9282a10581219cb7305212f89b14fc57f90fbc03fbd2655079c764902c556b7f174415c9e295 +SHA512 (rubygem-rspec-core-3.12.2-full.tar.gz) = 220becce9e96eaebb1280dfb52e8920e687069a09bcceeefe3e2cd8ef0cc0cb97ceec9e11fbd1e899e0b4e8f0c9317dc82a16a7b4ca7b2102c671d600bd1aad0 From 81ab95aa61daac05cf239d68f7b535b365651cfe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 18:20:06 +0000 Subject: [PATCH 38/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 199da28..29c5d94 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -204,6 +204,9 @@ done %{gem_docdir} %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Apr 19 2023 Mamoru TASAKA - 3.12.2-1 - 3.12.2 From 01442efdd9c4f688d746bac0cb303130421b7ed1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 22 Jul 2023 07:31:10 +0900 Subject: [PATCH 39/55] Fix one failing test related to thread local variable --- rubygem-rspec-core.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 29c5d94..12b0ad4 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 3 %global gem_name rspec-core @@ -131,6 +131,10 @@ sed -i spec/integration/spec_file_load_errors_spec.rb \ 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 @@ -204,6 +208,9 @@ done %{gem_docdir} %changelog +* Sat Jul 22 2023 Mamoru TASAKA - 3.12.2-3 +- Fix one failing test related to thread local variable + * Fri Jul 21 2023 Fedora Release Engineering - 3.12.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 27cebec369e31dfd68690885069cc390e857faa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:26:24 +0000 Subject: [PATCH 40/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 12b0ad4..0619d3f 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 3 +%global baserelease 4 %global gem_name rspec-core @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 3.12.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Mamoru TASAKA - 3.12.2-3 - Fix one failing test related to thread local variable From c9fcb4c160ac23511c33e57ac478ac843a0a2aa5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2024 15:22:51 +0900 Subject: [PATCH 41/55] 3.13.0 --- rubygem-rspec-core.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 0619d3f..7bec586 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.12.2 +%global majorver 3.13.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 4 +%global baserelease 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # 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 -%bcond_with bootstrap +%bcond_without bootstrap # Disable Aruba support in RHEL due to excesive dependency chain. This also # disables Cucumber integration test suite, which depends on Aruba as well. @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Fri Feb 09 2024 Mamoru TASAKA - 3.13.0-1 +- 3.13.0 + * Fri Jan 26 2024 Fedora Release Engineering - 3.12.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 06fb890..ce2b7b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.12.2.gem) = b798d0624eb53ca866a76cac74885bfb37a2715d21346e097c0a9282a10581219cb7305212f89b14fc57f90fbc03fbd2655079c764902c556b7f174415c9e295 -SHA512 (rubygem-rspec-core-3.12.2-full.tar.gz) = 220becce9e96eaebb1280dfb52e8920e687069a09bcceeefe3e2cd8ef0cc0cb97ceec9e11fbd1e899e0b4e8f0c9317dc82a16a7b4ca7b2102c671d600bd1aad0 +SHA512 (rspec-core-3.13.0.gem) = b24746c74ba6571c04ba1d95de3c557cc208870075cf7e9f603b18ac8b8dafbf5b2c8b2c58f564e91c58002947a64b5b30eed37069910e7d5bfa175faa2a58de +SHA512 (rubygem-rspec-core-3.13.0-full.tar.gz) = bfeb033a882769adbf65e2ce2cc2f6b3fcf2ad1095575fdb7d89b36b7d41af316119fe97020b10b3a8019c44db8464559c304a0e6fafaf8ba57df9e4f1cf9ff6 From 7cd8e8130799db80e871357fb959100b958517fd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2024 15:46:06 +0900 Subject: [PATCH 42/55] enable test again --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 7bec586..455dce8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -11,7 +11,7 @@ # 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 -%bcond_without bootstrap +%bcond_with bootstrap # Disable Aruba support in RHEL due to excesive dependency chain. This also # disables Cucumber integration test suite, which depends on Aruba as well. From 229ca4c56a0a07017465e23479953a7a741b5a14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:54:36 +0000 Subject: [PATCH 43/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 455dce8..007cc27 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Feb 09 2024 Mamoru TASAKA - 3.13.0-1 - 3.13.0 From 54535562029999ef258e4fc46084364111db8085 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 8 Sep 2024 00:03:34 +0900 Subject: [PATCH 44/55] 3.13.1 3.13.1 --- rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 007cc27..afa9f25 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.0 +%global majorver 3.13.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 1 %global gem_name rspec-core @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Thu Sep 05 2024 Mamoru TASAKA - 3.13.1-1 +- 3.13.1 + * Fri Jul 19 2024 Fedora Release Engineering - 3.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index ce2b7b5..245d236 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.0.gem) = b24746c74ba6571c04ba1d95de3c557cc208870075cf7e9f603b18ac8b8dafbf5b2c8b2c58f564e91c58002947a64b5b30eed37069910e7d5bfa175faa2a58de -SHA512 (rubygem-rspec-core-3.13.0-full.tar.gz) = bfeb033a882769adbf65e2ce2cc2f6b3fcf2ad1095575fdb7d89b36b7d41af316119fe97020b10b3a8019c44db8464559c304a0e6fafaf8ba57df9e4f1cf9ff6 +SHA512 (rspec-core-3.13.1.gem) = c6b906fab43ece1145480331372094eb9c02059d8aa7903b22d9bca3e6f76f34e68cfcf3b40a64ff5b00b22e564d135f03c93934bc05cba9ec5d1b1cda0e2769 +SHA512 (rubygem-rspec-core-3.13.1-full.tar.gz) = defb6ff30ea787241c7353d4d5210eb77fcb526fbed3942c540506044ee4ffe3a43982f0fce4ac78d0c3959760ce179f7c7a7e55d3bb9e8c3b5988768d67c8ef From 0e1e9960be1e068c15300c8fc3586f49cad1f23b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 22 Oct 2024 14:17:02 +0900 Subject: [PATCH 45/55] 3.13.2 --- rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index afa9f25..044cf34 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.1 +%global majorver 3.13.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Mon Oct 21 2024 Mamoru TASAKA - 3.13.2-1 +- 3.13.2 + * Thu Sep 05 2024 Mamoru TASAKA - 3.13.1-1 - 3.13.1 diff --git a/sources b/sources index 245d236..7e0e601 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.1.gem) = c6b906fab43ece1145480331372094eb9c02059d8aa7903b22d9bca3e6f76f34e68cfcf3b40a64ff5b00b22e564d135f03c93934bc05cba9ec5d1b1cda0e2769 -SHA512 (rubygem-rspec-core-3.13.1-full.tar.gz) = defb6ff30ea787241c7353d4d5210eb77fcb526fbed3942c540506044ee4ffe3a43982f0fce4ac78d0c3959760ce179f7c7a7e55d3bb9e8c3b5988768d67c8ef +SHA512 (rspec-core-3.13.2.gem) = 7ba117e1382f1ed787f9889efd0aac40a75de36a4b895600886fe7f3dc6a8efa029eea92208d8af0c3f4614e4214b99437bfc7d7ad9c93808e118405c6650513 +SHA512 (rubygem-rspec-core-3.13.2-full.tar.gz) = 61928d0a569510d6c49c8ce7025d37f6a60532f731458f159d340966582e7c0dc794c828dcbd33c8d4deefea3ed8fb104fc03060c9c4fbec47dfc972246e533a From ca81d02368e311d900ed13eece031aa11109e5d0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Nov 2024 22:21:07 +0900 Subject: [PATCH 46/55] add BR: rubygem(drb) for ruby34 --- rubygem-rspec-core.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 044cf34..8c33193 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -45,6 +45,7 @@ BuildRequires: rubygem(rake) BuildRequires: rubygem(rspec) BuildRequires: rubygem(test-unit) BuildRequires: rubygem(coderay) +BuildRequires: rubygem(drb) BuildRequires: rubygem(thread_order) BuildRequires: git @@ -208,6 +209,9 @@ done %{gem_docdir} %changelog +* Wed Nov 06 2024 Mamoru TASAKA - 3.13.2-2 +- add BR: rubygem(drb) for ruby34 + * Mon Oct 21 2024 Mamoru TASAKA - 3.13.2-1 - 3.13.2 From 91ba31bd1ca893d6901bb602ff2bd976e3c3c766 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Nov 2024 15:07:10 +0900 Subject: [PATCH 47/55] Fix for ruby34 string behavior to be chilled --- ...core-3.13.2-issue3123-ruby34-string-chilled.patch | 12 ++++++++++++ rubygem-rspec-core.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch diff --git a/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch b/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch new file mode 100644 index 0000000..2ab514d --- /dev/null +++ b/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch @@ -0,0 +1,12 @@ +diff -urp -x examples.txt '--exclude=*~' rspec-core-3.13.2.orig/lib/rspec/core/drb.rb rspec-core-3.13.2/lib/rspec/core/drb.rb +--- rspec-core-3.13.2.orig/lib/rspec/core/drb.rb 2024-10-21 14:23:30.000000000 +0900 ++++ rspec-core-3.13.2/lib/rspec/core/drb.rb 2024-11-15 14:48:52.388539773 +0900 +@@ -91,7 +91,7 @@ module RSpec + def add_filter(argv, name, hash) + hash.each_pair do |k, v| + next if CONDITIONAL_FILTERS.include?(k) +- tag = name == :inclusion ? k.to_s : "~#{k}".dup ++ tag = name == :inclusion ? k.to_s.dup : "~#{k}".dup + tag << ":#{v}" if v.is_a?(String) + argv << "--tag" << tag + end unless hash.empty? diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 8c33193..fd6b76f 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 3 %global gem_name rspec-core @@ -36,6 +36,9 @@ 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 +# https://github.com/rspec/rspec-core/issues/3123 +# <- by https://github.com/ruby/ruby/pull/12065 +Patch1: rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -90,6 +93,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 +%patch -P1 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -209,6 +213,9 @@ done %{gem_docdir} %changelog +* Fri Nov 15 2024 Mamoru TASAKA - 3.13.2-3 +- Fix for ruby34 string behavior to be chilled + * Wed Nov 06 2024 Mamoru TASAKA - 3.13.2-2 - add BR: rubygem(drb) for ruby34 From cdd2413fa07e8a1333b33b7eac73f3bfdba67b3b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Nov 2024 16:59:26 +0900 Subject: [PATCH 48/55] Workaround syntax_suggest 2.0.2 change --- ...e-3.13.2-issue3125-ruby34-syntax_suggest_202.patch | 11 +++++++++++ rubygem-rspec-core.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch diff --git a/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch b/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch new file mode 100644 index 0000000..96eb999 --- /dev/null +++ b/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch @@ -0,0 +1,11 @@ +diff -urp -x examples.txt rspec-core-3.13.2.orig/spec/integration/spec_file_load_errors_spec.rb rspec-core-3.13.2/spec/integration/spec_file_load_errors_spec.rb +--- rspec-core-3.13.2.orig/spec/integration/spec_file_load_errors_spec.rb 2024-11-17 15:44:24.856119952 +0900 ++++ rspec-core-3.13.2/spec/integration/spec_file_load_errors_spec.rb 2024-11-17 16:39:55.929770026 +0900 +@@ -224,6 +224,7 @@ RSpec.describe 'Spec file load errors' d + + # A fix was backported to 3.2.3 + if RUBY_VERSION > '3.2.2' ++ formatted_output.gsub!(/\n+/m, "\n") + expect(formatted_output).to include unindent(<<-EOS) + SyntaxError: + --> ./tmp/aruba/broken_file.rb diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index fd6b76f..af100de 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 3 +%global baserelease 4 %global gem_name rspec-core @@ -39,6 +39,9 @@ Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch # https://github.com/rspec/rspec-core/issues/3123 # <- by https://github.com/ruby/ruby/pull/12065 Patch1: rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch +# https://github.com/rspec/rspec-core/issues/3125 +# <- by syntax_suggest 2.0.2 https://github.com/ruby/syntax_suggest/pull/232 +Patch2: rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -94,6 +97,7 @@ This package contains documentation for %{name}. %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 %patch -P1 -p1 +%patch -P2 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -213,6 +217,9 @@ done %{gem_docdir} %changelog +* Sun Nov 17 2024 Mamoru TASAKA - 3.13.2-4 +- Workaround syntax_suggest 2.0.2 change + * Fri Nov 15 2024 Mamoru TASAKA - 3.13.2-3 - Fix for ruby34 string behavior to be chilled From 29635ced96c6b8bf23e7b41913b4702b9b118578 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:57:21 +0000 Subject: [PATCH 49/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index af100de..e6d6a07 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 4 +%global baserelease 5 %global gem_name rspec-core @@ -217,6 +217,9 @@ done %{gem_docdir} %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.13.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Nov 17 2024 Mamoru TASAKA - 3.13.2-4 - Workaround syntax_suggest 2.0.2 change From 45cdfd6fec41c39e745c4882a5c1b17c0647f568 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Feb 2025 16:12:01 +0900 Subject: [PATCH 50/55] 3.13.3 --- ...e-3.13.2-issue3123-ruby34-string-chilled.patch | 12 ------------ ...13.2-issue3125-ruby34-syntax_suggest_202.patch | 11 ----------- rspec-related-create-full-tarball.sh | 7 +++---- rubygem-rspec-core.spec | 15 +++++---------- sources | 4 ++-- 5 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch delete mode 100644 rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch diff --git a/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch b/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch deleted file mode 100644 index 2ab514d..0000000 --- a/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp -x examples.txt '--exclude=*~' rspec-core-3.13.2.orig/lib/rspec/core/drb.rb rspec-core-3.13.2/lib/rspec/core/drb.rb ---- rspec-core-3.13.2.orig/lib/rspec/core/drb.rb 2024-10-21 14:23:30.000000000 +0900 -+++ rspec-core-3.13.2/lib/rspec/core/drb.rb 2024-11-15 14:48:52.388539773 +0900 -@@ -91,7 +91,7 @@ module RSpec - def add_filter(argv, name, hash) - hash.each_pair do |k, v| - next if CONDITIONAL_FILTERS.include?(k) -- tag = name == :inclusion ? k.to_s : "~#{k}".dup -+ tag = name == :inclusion ? k.to_s.dup : "~#{k}".dup - tag << ":#{v}" if v.is_a?(String) - argv << "--tag" << tag - end unless hash.empty? diff --git a/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch b/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch deleted file mode 100644 index 96eb999..0000000 --- a/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urp -x examples.txt rspec-core-3.13.2.orig/spec/integration/spec_file_load_errors_spec.rb rspec-core-3.13.2/spec/integration/spec_file_load_errors_spec.rb ---- rspec-core-3.13.2.orig/spec/integration/spec_file_load_errors_spec.rb 2024-11-17 15:44:24.856119952 +0900 -+++ rspec-core-3.13.2/spec/integration/spec_file_load_errors_spec.rb 2024-11-17 16:39:55.929770026 +0900 -@@ -224,6 +224,7 @@ RSpec.describe 'Spec file load errors' d - - # A fix was backported to 3.2.3 - if RUBY_VERSION > '3.2.2' -+ formatted_output.gsub!(/\n+/m, "\n") - expect(formatted_output).to include unindent(<<-EOS) - SyntaxError: - --> ./tmp/aruba/broken_file.rb diff --git a/rspec-related-create-full-tarball.sh b/rspec-related-create-full-tarball.sh index a847c6c..c0ba6bf 100644 --- a/rspec-related-create-full-tarball.sh +++ b/rspec-related-create-full-tarball.sh @@ -14,10 +14,9 @@ CURRDIR=$(pwd) TMPDIRPATH=$(mktemp -d /var/tmp/rspec-tar-XXXXXX) pushd $TMPDIRPATH -git clone https://github.com/rspec/$1.git -pushd $1 -git reset --hard v$2 -popd +git clone https://github.com/rspec/rspec.git +pushd rspec +git reset --hard $1-v$2 ln -sf $1 $1-$2 tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./ diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index e6d6a07..471b767 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.2 +%global majorver 3.13.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 5 +%global baserelease 1 %global gem_name rspec-core @@ -36,12 +36,6 @@ 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 -# https://github.com/rspec/rspec-core/issues/3123 -# <- by https://github.com/ruby/ruby/pull/12065 -Patch1: rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch -# https://github.com/rspec/rspec-core/issues/3125 -# <- by syntax_suggest 2.0.2 https://github.com/ruby/syntax_suggest/pull/232 -Patch2: rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -96,8 +90,6 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -217,6 +209,9 @@ done %{gem_docdir} %changelog +* Tue Feb 11 2025 Mamoru TASAKA - 3.13.3-1 +- 3.13.3 + * Sat Jan 18 2025 Fedora Release Engineering - 3.13.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 7e0e601..dca932c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.2.gem) = 7ba117e1382f1ed787f9889efd0aac40a75de36a4b895600886fe7f3dc6a8efa029eea92208d8af0c3f4614e4214b99437bfc7d7ad9c93808e118405c6650513 -SHA512 (rubygem-rspec-core-3.13.2-full.tar.gz) = 61928d0a569510d6c49c8ce7025d37f6a60532f731458f159d340966582e7c0dc794c828dcbd33c8d4deefea3ed8fb104fc03060c9c4fbec47dfc972246e533a +SHA512 (rubygem-rspec-core-3.13.3-full.tar.gz) = 8d031e11c2467f3626341ec874fde007db97823b83c30f04a2cea6c1b0692c719647ca7f36d9190ca2410010af2827cb742e3af096e678d88232c7e5064e3281 +SHA512 (rspec-core-3.13.3.gem) = 33c06cfab982f6f1b2f75d4f0f8aaa81aa87ce62c31c8ff8fe880d3e41d7a3a5d10b9efc6f49135f2624194cbb9775e30dbb52819ee94c767a3cb85492686635 From 87bc1190a316e8ecedf4df554fc232d1510ca17e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 May 2025 17:33:15 +0900 Subject: [PATCH 51/55] 3.13.4 --- rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 471b767..bfa7a8d 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.3 +%global majorver 3.13.4 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -28,7 +28,7 @@ Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} # SPDX confirmed License: MIT -URL: http://github.com/rspec/rspec-core +URL: https://rspec.info Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz @@ -209,6 +209,9 @@ done %{gem_docdir} %changelog +* Thu May 29 2025 Mamoru TASAKA - 3.13.4-1 +- 3.13.4 + * Tue Feb 11 2025 Mamoru TASAKA - 3.13.3-1 - 3.13.3 diff --git a/sources b/sources index dca932c..c7cf56a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-rspec-core-3.13.3-full.tar.gz) = 8d031e11c2467f3626341ec874fde007db97823b83c30f04a2cea6c1b0692c719647ca7f36d9190ca2410010af2827cb742e3af096e678d88232c7e5064e3281 -SHA512 (rspec-core-3.13.3.gem) = 33c06cfab982f6f1b2f75d4f0f8aaa81aa87ce62c31c8ff8fe880d3e41d7a3a5d10b9efc6f49135f2624194cbb9775e30dbb52819ee94c767a3cb85492686635 +SHA512 (rspec-core-3.13.4.gem) = 5727510a039a5c59ec86de57ebd13000a3f24f0d3db05fa4a2930184c8a9f011fe829b86f4c9a41a9d978ca58fead36648d70367f6fedd2626b60a1978ef7207 +SHA512 (rubygem-rspec-core-3.13.4-full.tar.gz) = 8873cfd241b7e08945f7f1fdec0dcd28a93f86abfcee44d31e3e6250ba1c5a1d8773406f77ecbc34e9009003fd9121d49d500f982c5cb54f14f5432dbd6b4172 From 3f7c63406ef50c5fdaf4a2d402022536d94c944c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 27 Jun 2025 22:39:02 +0900 Subject: [PATCH 52/55] 3.13.5 --- rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index bfa7a8d..775cb51 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.4 +%global majorver 3.13.5 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -209,6 +209,9 @@ done %{gem_docdir} %changelog +* Fri Jun 27 2025 Mamoru TASAKA - 3.13.5-1 +- 3.13.5 + * Thu May 29 2025 Mamoru TASAKA - 3.13.4-1 - 3.13.4 diff --git a/sources b/sources index c7cf56a..2bbf4c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.4.gem) = 5727510a039a5c59ec86de57ebd13000a3f24f0d3db05fa4a2930184c8a9f011fe829b86f4c9a41a9d978ca58fead36648d70367f6fedd2626b60a1978ef7207 -SHA512 (rubygem-rspec-core-3.13.4-full.tar.gz) = 8873cfd241b7e08945f7f1fdec0dcd28a93f86abfcee44d31e3e6250ba1c5a1d8773406f77ecbc34e9009003fd9121d49d500f982c5cb54f14f5432dbd6b4172 +SHA512 (rspec-core-3.13.5.gem) = ee5f98d1b82ae6084a644bad4ed4c38b76fb0571fc6ea8d49d4459017fdf4615139f8b1f7d33951efde173d7e447da52aef36b13216bc4fb8cc73d1646461b70 +SHA512 (rubygem-rspec-core-3.13.5-full.tar.gz) = d2ca4987aa957b192bc41bccc1cbcda8da86681b342e369c434d4a59ff64559101a345e072659995bc16a2ac4a135e9611feb1fb193f28cce53c0c80e26d5798 From e8c2a97d1a6df4ee1c8c233c9fd2975c949012fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:45:26 +0000 Subject: [PATCH 53/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 775cb51..ec835b4 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -209,6 +209,9 @@ done %{gem_docdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.13.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jun 27 2025 Mamoru TASAKA - 3.13.5-1 - 3.13.5 From 7effbf81cb92d50fc56a4061a342eb70a98d5bac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Oct 2025 15:07:20 +0900 Subject: [PATCH 54/55] 3.13.6 --- rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index ec835b4..1df05b5 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.5 +%global majorver 3.13.6 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 1 %global gem_name rspec-core @@ -209,6 +209,9 @@ done %{gem_docdir} %changelog +* Mon Oct 20 2025 Mamoru TASAKA - 3.13.6-1 +- 3.13.6 + * Fri Jul 25 2025 Fedora Release Engineering - 3.13.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 2bbf4c4..4078df9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.5.gem) = ee5f98d1b82ae6084a644bad4ed4c38b76fb0571fc6ea8d49d4459017fdf4615139f8b1f7d33951efde173d7e447da52aef36b13216bc4fb8cc73d1646461b70 -SHA512 (rubygem-rspec-core-3.13.5-full.tar.gz) = d2ca4987aa957b192bc41bccc1cbcda8da86681b342e369c434d4a59ff64559101a345e072659995bc16a2ac4a135e9611feb1fb193f28cce53c0c80e26d5798 +SHA512 (rspec-core-3.13.6.gem) = 8456a4505bd990a968630da475fd5222a15e0641db26d0efbf63e5d1d8edea702c7982297c4fd7e647167b7204127e4dd6d49480a9556faa65f06e0ce8ad3513 +SHA512 (rubygem-rspec-core-3.13.6-full.tar.gz) = 2cb5c5ffe9c76a58385ccac68fbbc696e6c542cf68007ab81b29e5ad6ecc97ec05cd34eb1006b2be1d70c826ab520b32e37182bbd14f662260996a1e5aa1bf06 From 474d1f7c635c218569b4b84c143fe2c41b267e47 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Dec 2025 16:42:35 +0900 Subject: [PATCH 55/55] Backport upstream patch to support ruby4_0 source_location behavior change --- ...c-core-pr282-ruby4_0-source_location.patch | 51 +++++++++++++++++++ rubygem-rspec-core.spec | 9 +++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 rspec-core-pr282-ruby4_0-source_location.patch diff --git a/rspec-core-pr282-ruby4_0-source_location.patch b/rspec-core-pr282-ruby4_0-source_location.patch new file mode 100644 index 0000000..1fa6999 --- /dev/null +++ b/rspec-core-pr282-ruby4_0-source_location.patch @@ -0,0 +1,51 @@ +From 1c20fa80772ca7a1ed0512056ce7cd6a94f8e68d Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Fri, 28 Nov 2025 10:59:10 +0000 +Subject: [PATCH] Cope with the changes to block source_location in Ruby 4 + +--- + rspec-core/lib/rspec/core/hooks.rb | 2 +- + rspec-core/lib/rspec/core/metadata.rb | 2 +- + rspec-core/lib/rspec/core/shared_example_group.rb | 2 +- + .../lib/rspec/expectations/block_snippet_extractor.rb | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/rspec-core/lib/rspec/core/hooks.rb b/rspec-core/lib/rspec/core/hooks.rb +index f97962ce9..77eecc776 100644 +--- a/rspec-core/lib/rspec/core/hooks.rb ++++ b/rspec-core/lib/rspec/core/hooks.rb +@@ -395,7 +395,7 @@ def execute_with(example, procsy) + + if Proc.method_defined?(:source_location) + def hook_description +- "around hook at #{Metadata.relative_path(block.source_location.join(':'))}" ++ "around hook at #{Metadata.relative_path(block.source_location.take(2).join(':'))}" + end + else # for 1.8.7 + # :nocov: +diff --git a/rspec-core/lib/rspec/core/metadata.rb b/rspec-core/lib/rspec/core/metadata.rb +index e887cb1c5..ed47bc07b 100644 +--- a/rspec-core/lib/rspec/core/metadata.rb ++++ b/rspec-core/lib/rspec/core/metadata.rb +@@ -146,7 +146,7 @@ def populate_location_attributes + file_path, line_number = if backtrace + file_path_and_line_number_from(backtrace) + elsif block.respond_to?(:source_location) +- block.source_location ++ block.source_location.take(2) + else + file_path_and_line_number_from(caller) + end +diff --git a/rspec-core/lib/rspec/core/shared_example_group.rb b/rspec-core/lib/rspec/core/shared_example_group.rb +index b4a5dc317..1f2b9d623 100644 +--- a/rspec-core/lib/rspec/core/shared_example_group.rb ++++ b/rspec-core/lib/rspec/core/shared_example_group.rb +@@ -243,7 +243,7 @@ def warn_if_key_taken(context, key, new_block) + + if RUBY_VERSION.to_f >= 1.9 + def formatted_location(block) +- block.source_location.join(":") ++ block.source_location.take(2).join(":") + end + else # 1.8.7 + # :nocov: diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 1df05b5..d3183f3 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -36,6 +36,9 @@ 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 +# https://github.com/rspec/rspec/pull/282/commits/1c20fa80772ca7a1ed0512056ce7cd6a94f8e68d +# Support ruby4_0 source_location behavior change +Patch1: rspec-core-pr282-ruby4_0-source_location.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -90,6 +93,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 +%patch -P1 -p2 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -209,6 +213,9 @@ done %{gem_docdir} %changelog +* Tue Dec 02 2025 Mamoru TASAKA - 3.13.6-2 +- Backport upstream patch to support ruby4_0 source_location behavior change + * Mon Oct 20 2025 Mamoru TASAKA - 3.13.6-1 - 3.13.6