From 87bc1190a316e8ecedf4df554fc232d1510ca17e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 May 2025 17:33:15 +0900 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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