diff --git a/rubygem-rspec-mocks-3.12.0-fixup-argument-forwarding-ruby32.patch b/rubygem-rspec-mocks-3.12.0-fixup-argument-forwarding-ruby32.patch new file mode 100644 index 0000000..6283d02 --- /dev/null +++ b/rubygem-rspec-mocks-3.12.0-fixup-argument-forwarding-ruby32.patch @@ -0,0 +1,22 @@ +From c1840fcf4a08a2e54aabb18df454544f950f679e Mon Sep 17 00:00:00 2001 +From: ojab +Date: Wed, 16 Nov 2022 22:56:12 +0000 +Subject: [PATCH] Fixup argument forwarding on ruby-3.2 + +Fixes #1495 +--- + lib/rspec/mocks/verifying_proxy.rb | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/rspec/mocks/verifying_proxy.rb b/lib/rspec/mocks/verifying_proxy.rb +index b39871c87..1d8d207dc 100644 +--- a/lib/rspec/mocks/verifying_proxy.rb ++++ b/lib/rspec/mocks/verifying_proxy.rb +@@ -160,6 +160,7 @@ def proxy_method_invoked(obj, *args, &block) + validate_arguments!(args) + super + end ++ ruby2_keywords :proxy_method_invoked if respond_to?(:ruby2_keywords, true) + + def validate_arguments!(actual_args) + @method_reference.with_signature do |signature| diff --git a/rubygem-rspec-mocks.spec b/rubygem-rspec-mocks.spec index d43479d..83be55a 100644 --- a/rubygem-rspec-mocks.spec +++ b/rubygem-rspec-mocks.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-mocks @@ -27,6 +27,9 @@ Source2: rspec-related-create-full-tarball.sh Patch1: rubygem-rspec-mocks-3.12.0-display_keyword_hashes.patch # ... and related to the above, and commit 66250dc1819f9435e5f584064067e7f05a9afe72 Patch2: rubygem-rspec-mocks-3.12.0-display_keyword_hashes-additional.patch +# https://github.com/rspec/rspec-mocks/pull/1502 +# Fixup argument forwarding on ruby-3.2 +Patch3: rubygem-rspec-mocks-3.12.0-fixup-argument-forwarding-ruby32.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -64,6 +67,7 @@ gem unpack %{SOURCE0} %patch1 -p1 -R %patch2 -p1 -R %endif +%patch3 -p1 # Cucumber 7 syntax change sed -i cucumber.yml -e "s|~@wip|not @wip|" @@ -109,6 +113,9 @@ cucumber %{gem_docdir} %changelog +* Fri Dec 2 2022 Mamoru TASAKA - 3.12.0-3 +- Backport upstream reviewing patch for ruby32 ruby2_keywords treatment change + * Thu Nov 3 2022 Mamoru TASAKA - 3.12.0-2 - On Fedora 37, remove "Display keyword hashes" feature for now (On Fedora 38, this is effective)