This commit is contained in:
Mamoru TASAKA 2023-02-16 18:09:39 +09:00
parent 7643aa8e8d
commit b527e5d20d
3 changed files with 8 additions and 30 deletions

View File

@ -1,22 +0,0 @@
From c1840fcf4a08a2e54aabb18df454544f950f679e Mon Sep 17 00:00:00 2001
From: ojab <ojab@ojab.ru>
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|

View File

@ -1,9 +1,9 @@
%global majorver 3.12.0 %global majorver 3.12.3
#%%global preminorver .rc6 #%%global preminorver .rc6
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
%global fullver %{majorver}%{?preminorver} %global fullver %{majorver}%{?preminorver}
%global fedorarel 3 %global fedorarel 1
%global gem_name rspec-mocks %global gem_name rspec-mocks
@ -14,7 +14,7 @@
Summary: RSpec's 'test double' framework (mocks and stubs) Summary: RSpec's 'test double' framework (mocks and stubs)
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: %{majorver} Version: %{majorver}
Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}
License: MIT License: MIT
URL: http://github.com/rspec/rspec-mocks URL: http://github.com/rspec/rspec-mocks
@ -28,8 +28,6 @@ Patch1: rubygem-rspec-mocks-3.12.0-display_keyword_hashes.patch
# ... and related to the above, and commit 66250dc1819f9435e5f584064067e7f05a9afe72 # ... and related to the above, and commit 66250dc1819f9435e5f584064067e7f05a9afe72
Patch2: rubygem-rspec-mocks-3.12.0-display_keyword_hashes-additional.patch Patch2: rubygem-rspec-mocks-3.12.0-display_keyword_hashes-additional.patch
# https://github.com/rspec/rspec-mocks/pull/1502 # 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: ruby(release)
BuildRequires: rubygems-devel BuildRequires: rubygems-devel
@ -67,7 +65,6 @@ gem unpack %{SOURCE0}
%patch1 -p1 -R %patch1 -p1 -R
%patch2 -p1 -R %patch2 -p1 -R
%endif %endif
%patch3 -p1
# Cucumber 7 syntax change # Cucumber 7 syntax change
sed -i cucumber.yml -e "s|~@wip|not @wip|" sed -i cucumber.yml -e "s|~@wip|not @wip|"
@ -113,6 +110,9 @@ cucumber
%{gem_docdir} %{gem_docdir}
%changelog %changelog
* Thu Feb 16 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.3-1
- 3.12.3
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-3.1 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (rspec-mocks-3.12.0.gem) = eb4a54ac73736e2648c8c14cac1362bafd59452ca54e18f4feb9caa5c5412a449c1cdd9909bd8bfb17f3bcb83c189ab722cbdd409b3942c09f12f427742fd964 SHA512 (rspec-mocks-3.12.3.gem) = a4a02d11f41448d9518b736f9d73641c259b6e2872c8b13208db3d1c9b488735e60f6087dfc53b42ed973e87a2c4befe77b8c348a124dd39fe2ed759a09189ee
SHA512 (rubygem-rspec-mocks-3.12.0-full.tar.gz) = 808d6fd1b0e71e2ab026650a3fb142a3d806d8f54183f08b379cc20b789982ec1dca791535dcf29ea3f1954909a75b83291397479fe87f1054123a0a5411cdd6 SHA512 (rubygem-rspec-mocks-3.12.3-full.tar.gz) = 7b18c321c9562d7a642bb37a8bb724f86ef6f51c56b6c634ec01056285919467818bff58a7cf986b9c33d26cf0dc99aaff67f65a758975dfcc40751bc7f0d642