From e627fe67621511eaa2463165e4743f96877dc599 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 19:11:06 +0000 Subject: [PATCH 01/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-expectations.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index fd8c9f0..1b2a75d 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -14,7 +14,7 @@ Summary: RSpec expectations (should and matchers) 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-expectations @@ -96,6 +96,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.10.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 18 2022 Mamoru TASAKA - 3.10.2-1 - 3.10.2 - Execute cucumber test From 62f2d363e75244fb92da813c8822ae956ccd19f8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 30 Jan 2022 12:05:11 +0900 Subject: [PATCH 02/33] BR: rubygem(rake) for check --- rubygem-rspec-expectations.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 1b2a75d..1ec4cb9 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -14,7 +14,7 @@ Summary: RSpec expectations (should and matchers) 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-expectations @@ -27,6 +27,7 @@ Source2: rspec-related-create-full-tarball.sh BuildRequires: rubygems-devel %if 0%{?need_bootstrap_set} < 1 BuildRequires: rubygem(rspec) +BuildRequires: rubygem(rake) # Some features in expectations needs this BuildRequires: rubygem(rspec-support) >= 3.9.3 BuildRequires: rubygem(minitest) >= 5 @@ -96,6 +97,9 @@ cucumber \ %{gem_docdir} %changelog +* Sun Jan 30 2022 Mamoru TASAKA - 3.10.2-2 +- BR: rubygem(rake) for check + * Fri Jan 21 2022 Fedora Release Engineering - 3.10.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c0deabd44b4d027f4f27e8f6579bf565b14a3dea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 10 Feb 2022 12:32:36 +0900 Subject: [PATCH 03/33] 3.11.0 --- rubygem-rspec-expectations.spec | 16 ++++++++++------ sources | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 1ec4cb9..5d09b04 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,13 +1,13 @@ -%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-expectations -%global need_bootstrap_set 0 +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -25,7 +25,7 @@ Source2: rspec-related-create-full-tarball.sh #BuildRequires: ruby(release) BuildRequires: rubygems-devel -%if 0%{?need_bootstrap_set} < 1 +%if %{without bootstrap} BuildRequires: rubygem(rspec) BuildRequires: rubygem(rake) # Some features in expectations needs this @@ -66,10 +66,11 @@ cp -a .%{gem_dir}/* \ # cleanups rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} -%if 0%{?need_bootstrap_set} < 1 %check +%if %{without bootstrap} LANG=C.UTF-8 -ruby -rrubygems -Ilib/ -S rspec spec/ +export RUBYLIB=$(pwd)/lib +rspec spec/ # Skip one failing scenario, needs investigating... sed -i features/built_in_matchers/include.feature -e '\@skip-on-fedora@d' @@ -97,6 +98,9 @@ cucumber \ %{gem_docdir} %changelog +* Thu Feb 10 2022 Mamoru TASAKA - 3.11.0-1 +- 3.11.0 + * Sun Jan 30 2022 Mamoru TASAKA - 3.10.2-2 - BR: rubygem(rake) for check diff --git a/sources b/sources index 4a2a507..436da65 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.10.2.gem) = b01a2fbee344c4094de6e23e78a5533920c05ad60a9a990237d77c4b3376f14e7b3adbc2dea013c539f9ee627ae887e40678a15dee89b4c64c5c8c1c40f826ca -SHA512 (rubygem-rspec-expectations-3.10.2-full.tar.gz) = 06e123bd691fb4627f4ed2c7f1342101a780aefbadc23565a2a62473acf2ad5d79cf4515dd32f20d7a255e37b6c992c30005228eb80605cfc84918e6d6390552 +SHA512 (rspec-expectations-3.11.0.gem) = b3797f6b7b591dc78704051749bebbaf34827b72d5f09139bb413bdfb6f96dc0d5ade9111f4cdb7ee07a22affcc057214d8baa7c48ba93c1950a85561a1dbd5e +SHA512 (rubygem-rspec-expectations-3.11.0-full.tar.gz) = 72f34fe54a66cb096ed82c485ef75373e17b9f90a717c5b35c0f0b628898f00c187df27e4f4216fa1a3f9a35628b713de7f3768fe349b2afaaa8491ec4cb4977 From 50c2a449d506c298ec12f90cd46f1d6fc355cdb0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 10 Feb 2022 13:24:05 +0900 Subject: [PATCH 04/33] kill bootstrap --- rubygem-rspec-expectations.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 5d09b04..77362b1 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -7,7 +7,7 @@ %global gem_name rspec-expectations -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From d04982d2be5f1dcc7b372e36e5cc138ccac6f1e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 02:13:08 +0000 Subject: [PATCH 05/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-expectations.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 77362b1..f07f1c1 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -14,7 +14,7 @@ Summary: RSpec expectations (should and matchers) 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-expectations @@ -98,6 +98,9 @@ cucumber \ %{gem_docdir} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Feb 10 2022 Mamoru TASAKA - 3.11.0-1 - 3.11.0 From 2c0b83964ce51881054c6a5a9560c8481698cf58 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 Sep 2022 15:39:11 +0900 Subject: [PATCH 06/33] 3.11.1 --- rubygem-rspec-expectations.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index f07f1c1..0c75cf9 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,4 +1,4 @@ -%global majorver 3.11.0 +%global majorver 3.11.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -14,7 +14,7 @@ Summary: RSpec expectations (should and matchers) 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-expectations @@ -98,6 +98,9 @@ cucumber \ %{gem_docdir} %changelog +* Thu Sep 15 2022 Mamoru TASAKA - 3.11.1-1 +- 3.11.1 + * Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 436da65..421dd22 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.11.0.gem) = b3797f6b7b591dc78704051749bebbaf34827b72d5f09139bb413bdfb6f96dc0d5ade9111f4cdb7ee07a22affcc057214d8baa7c48ba93c1950a85561a1dbd5e -SHA512 (rubygem-rspec-expectations-3.11.0-full.tar.gz) = 72f34fe54a66cb096ed82c485ef75373e17b9f90a717c5b35c0f0b628898f00c187df27e4f4216fa1a3f9a35628b713de7f3768fe349b2afaaa8491ec4cb4977 +SHA512 (rspec-expectations-3.11.1.gem) = ed29a70183124dcb6f0ed1c322187f920fcb7995bf8fbbb2069d6329cea117fd526d1601f0287f078e47ab6e0c65af3ef56cbc8be7f75e84550b74f9aa3b3ef0 +SHA512 (rubygem-rspec-expectations-3.11.1-full.tar.gz) = 8114906f7517fc45ada62d3ff55f460f2ec93fd2f8370fdcfeb266d41c65d24c78363007ccd401814b6c54636a1c81dd1297a1556bc8f3a66a93ff36ae3d2267 From bb877891e1a6d84b3f19ed73e321059f9d49024a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 15:39:20 +0900 Subject: [PATCH 07/33] 3.12.0 --- rubygem-rspec-expectations.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 0c75cf9..8877dd8 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,4 +1,4 @@ -%global majorver 3.11.1 +%global majorver 3.12.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -7,7 +7,7 @@ %global gem_name rspec-expectations -%bcond_with bootstrap +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -98,6 +98,9 @@ cucumber \ %{gem_docdir} %changelog +* Thu Oct 27 2022 Mamoru TASAKA - 3.12.0-1 +- 3.12.0 + * Thu Sep 15 2022 Mamoru TASAKA - 3.11.1-1 - 3.11.1 diff --git a/sources b/sources index 421dd22..263c170 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.11.1.gem) = ed29a70183124dcb6f0ed1c322187f920fcb7995bf8fbbb2069d6329cea117fd526d1601f0287f078e47ab6e0c65af3ef56cbc8be7f75e84550b74f9aa3b3ef0 -SHA512 (rubygem-rspec-expectations-3.11.1-full.tar.gz) = 8114906f7517fc45ada62d3ff55f460f2ec93fd2f8370fdcfeb266d41c65d24c78363007ccd401814b6c54636a1c81dd1297a1556bc8f3a66a93ff36ae3d2267 +SHA512 (rspec-expectations-3.12.0.gem) = 2372692c23c9b15a9073d1ae6d2fe0008de71609f447137c30c19c5a7c775ca11c071af7ba41905a0b70a2236e93ad07752d4884424be6c6a3172a02964aefa3 +SHA512 (rubygem-rspec-expectations-3.12.0-full.tar.gz) = 3cdddb893ac5dc8649c82a16fe529f599bb6e1a2e39bdfc38786bebc7171193b1ec1381c63f95281d40fe43ac09744e1a3f2e89f0813e51b798edc17e2526955 From 0f7918b28c7739113f5964bf595ac312daeb8314 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 16:03:07 +0900 Subject: [PATCH 08/33] enable test again --- rubygem-rspec-expectations.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 8877dd8..3cc0306 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -7,7 +7,7 @@ %global gem_name rspec-expectations -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 6e084a2f349e132b356ece3a01187eb7c1fdc6b1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 21 Dec 2022 16:59:38 +0900 Subject: [PATCH 09/33] 3.12.1 --- rubygem-rspec-expectations.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 3cc0306..324b46e 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,4 +1,4 @@ -%global majorver 3.12.0 +%global majorver 3.12.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -98,6 +98,9 @@ cucumber \ %{gem_docdir} %changelog +* Wed Dec 21 2022 Mamoru TASAKA - 3.12.1-1 +- 3.12.1 + * Thu Oct 27 2022 Mamoru TASAKA - 3.12.0-1 - 3.12.0 diff --git a/sources b/sources index 263c170..937a852 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.12.0.gem) = 2372692c23c9b15a9073d1ae6d2fe0008de71609f447137c30c19c5a7c775ca11c071af7ba41905a0b70a2236e93ad07752d4884424be6c6a3172a02964aefa3 -SHA512 (rubygem-rspec-expectations-3.12.0-full.tar.gz) = 3cdddb893ac5dc8649c82a16fe529f599bb6e1a2e39bdfc38786bebc7171193b1ec1381c63f95281d40fe43ac09744e1a3f2e89f0813e51b798edc17e2526955 +SHA512 (rspec-expectations-3.12.1.gem) = e0417d7ef10c4ede71510f8e06bd2efb24e233d501cc699a0dfb0e2cf23a70617e9bf12c55ca112947512eca36ceb390c7ed38ce1f64366b8395499ed8467e10 +SHA512 (rubygem-rspec-expectations-3.12.1-full.tar.gz) = 221d3554c44eff2eacadbba99d3f812275d2ecbe059e039d955a740ebb0a8beadb33b43fab14b94552052aae7313cdea44ae1f5a209c403db6957905d83cd9f6 From d548dc81709062613c956004c48a249eaebc74ca Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 17 Jan 2023 14:27:32 +0900 Subject: [PATCH 10/33] 3.12.2 --- rubygem-rspec-expectations.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 324b46e..147ff78 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,4 +1,4 @@ -%global majorver 3.12.1 +%global majorver 3.12.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -98,6 +98,9 @@ cucumber \ %{gem_docdir} %changelog +* Tue Jan 17 2023 Mamoru TASAKA - 3.12.2-1 +- 3.12.2 + * Wed Dec 21 2022 Mamoru TASAKA - 3.12.1-1 - 3.12.1 diff --git a/sources b/sources index 937a852..5f0421c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.12.1.gem) = e0417d7ef10c4ede71510f8e06bd2efb24e233d501cc699a0dfb0e2cf23a70617e9bf12c55ca112947512eca36ceb390c7ed38ce1f64366b8395499ed8467e10 -SHA512 (rubygem-rspec-expectations-3.12.1-full.tar.gz) = 221d3554c44eff2eacadbba99d3f812275d2ecbe059e039d955a740ebb0a8beadb33b43fab14b94552052aae7313cdea44ae1f5a209c403db6957905d83cd9f6 +SHA512 (rspec-expectations-3.12.2.gem) = 9c7424b87ccc9c99644c0dc0fabd306f65cf889971cf08ab3b60b3079eec0c7d4fe0baf15545705f0db7b9fbb78d4ac8d06607f5a43bd3515ecb857e06d54514 +SHA512 (rubygem-rspec-expectations-3.12.2-full.tar.gz) = ad9b8a95a77a6573a5c2ecffb7fd8767242cbcd52c2ea50d5d78de15850cd3d81fea319af542e2171a5acbd6f09fe4d5f0bd2a04b11727997800316dc45e0856 From a6622412d52b0a98e4b41c6a764acf7629d9d4da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 21:04:32 +0000 Subject: [PATCH 11/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-expectations.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 147ff78..945056c 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -14,7 +14,7 @@ Summary: RSpec expectations (should and matchers) 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-expectations @@ -98,6 +98,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 3.12.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 17 2023 Mamoru TASAKA - 3.12.2-1 - 3.12.2 From 4597d7c301325731279fc77045170ea9c5444a97 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 10 Mar 2023 15:49:27 -0500 Subject: [PATCH 12/33] Disable unwanted dependencies in RHEL builds --- rubygem-rspec-expectations.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 945056c..d893cbd 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -31,8 +31,10 @@ BuildRequires: rubygem(rake) # Some features in expectations needs this BuildRequires: rubygem(rspec-support) >= 3.9.3 BuildRequires: rubygem(minitest) >= 5 +%if ! 0%{?rhel} BuildRequires: rubygem(aruba) BuildRequires: rubygem(cucumber) +%endif BuildRequires: git %endif BuildArch: noarch @@ -72,6 +74,7 @@ LANG=C.UTF-8 export RUBYLIB=$(pwd)/lib rspec spec/ +%if ! 0%{?rhel} # Skip one failing scenario, needs investigating... sed -i features/built_in_matchers/include.feature -e '\@skip-on-fedora@d' sed -i features/built_in_matchers/include.feature -e 's|^\([ \t]*\)\(Scenario: counts usage.*\)|\1@skip-on-fedora\n\1\2|' @@ -81,6 +84,7 @@ cucumber \ --tag "not @skip-on-fedora" \ %{nil} %endif +%endif %files %dir %{gem_instdir} From 377e09aedebc81be297bfb2e986f34a9ba6fc9d4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:36:20 +0900 Subject: [PATCH 13/33] rename release macro to make rpmdev-bumprelease work --- rubygem-rspec-expectations.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 945056c..2df5002 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global baserelease 1 %global gem_name rspec-expectations @@ -14,7 +14,7 @@ Summary: RSpec expectations (should and matchers) Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-expectations From 1d68faa32285ed7c6809eb9d9c079d3fd1386e38 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:48:04 +0900 Subject: [PATCH 14/33] refactor --- rubygem-rspec-expectations.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 62d0136..ae1c645 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -14,7 +14,7 @@ Summary: RSpec expectations (should and matchers) Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-expectations @@ -69,12 +69,20 @@ cp -a .%{gem_dir}/* \ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %check -%if %{without bootstrap} +%if %{with bootstrap} +# Skip test, exiting +exit 0 +%endif + LANG=C.UTF-8 export RUBYLIB=$(pwd)/lib rspec spec/ -%if ! 0%{?rhel} +%if 0%{?rhel} +# Skip cucumber test +exit 0 +%endif + # Skip one failing scenario, needs investigating... sed -i features/built_in_matchers/include.feature -e '\@skip-on-fedora@d' sed -i features/built_in_matchers/include.feature -e 's|^\([ \t]*\)\(Scenario: counts usage.*\)|\1@skip-on-fedora\n\1\2|' @@ -83,8 +91,6 @@ cucumber \ --tag "not @skip-when-diff-lcs-1.3" \ --tag "not @skip-on-fedora" \ %{nil} -%endif -%endif %files %dir %{gem_instdir} @@ -102,6 +108,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Mar 10 2023 Yaakov Selkowitz - 3.12.2-2 +- Disable unwanted dependencies in RHEL builds + * Fri Jan 20 2023 Fedora Release Engineering - 3.12.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e20bba14d6b1a490e6862f87023562275ad0f22d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 15 Mar 2023 16:29:11 +0900 Subject: [PATCH 15/33] SPDX confirmed --- rubygem-rspec-expectations.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 2df5002..0948936 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -16,6 +16,7 @@ Name: rubygem-%{gem_name} Version: %{majorver} Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist}.1 +# SPDX confirmed License: MIT URL: http://github.com/rspec/rspec-expectations Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem From 0c32d4b03442b7a7b9dd92ad2c64660d77990cd7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 21 Apr 2023 11:08:11 +0900 Subject: [PATCH 16/33] 3.12.3 --- rubygem-rspec-expectations.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index b89a232..2cf4541 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,9 +1,9 @@ -%global majorver 3.12.2 +%global majorver 3.12.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 1 %global gem_name rspec-expectations @@ -109,6 +109,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Apr 21 2023 Mamoru TASAKA - 3.12.3-1 +- 3.12.3 + * Fri Mar 10 2023 Yaakov Selkowitz - 3.12.2-2 - Disable unwanted dependencies in RHEL builds diff --git a/sources b/sources index 5f0421c..afe8468 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.12.2.gem) = 9c7424b87ccc9c99644c0dc0fabd306f65cf889971cf08ab3b60b3079eec0c7d4fe0baf15545705f0db7b9fbb78d4ac8d06607f5a43bd3515ecb857e06d54514 -SHA512 (rubygem-rspec-expectations-3.12.2-full.tar.gz) = ad9b8a95a77a6573a5c2ecffb7fd8767242cbcd52c2ea50d5d78de15850cd3d81fea319af542e2171a5acbd6f09fe4d5f0bd2a04b11727997800316dc45e0856 +SHA512 (rspec-expectations-3.12.3.gem) = 58717c22078f09b9b5fce785cbc2b210a513067ede9210bc6391bc06325dfc8c1f6ffeffacbeed955ec556bada210b36ec236e49249dce96d3d20ed61258d009 +SHA512 (rubygem-rspec-expectations-3.12.3-full.tar.gz) = 6e826663a939502705317cc1214a74741bc8c65e6971ae7b651958be5582ac6d4a097911c602034321c2efeb5b02fd7d26a33ce52dd631bc8be74483018ccf02 From 484a0f979f8b5f5de067cef493bcd7674367bf68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 18:20:17 +0000 Subject: [PATCH 17/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-expectations.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 2cf4541..158933f 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -109,6 +109,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.12.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Apr 21 2023 Mamoru TASAKA - 3.12.3-1 - 3.12.3 From 6a9936b01e506bff9be3f85ff510dd4d1403fcc4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 4 Aug 2023 15:17:05 +0900 Subject: [PATCH 18/33] Support MiniTest 5.19+ --- rubygem-rspec-expectations.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 158933f..aa007ec 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -57,6 +57,11 @@ This package contains documentation for %{name}. gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec +# MiniTest 5.19+ +%if 0%{?fedora} >= 39 +grep -rl MiniTest spec/ | xargs sed -i 's|MiniTest::|Minitest::|' +%endif + %build gem build %{gem_name}.gemspec %gem_install @@ -109,6 +114,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Aug 4 2023 Mamoru TASAKA - 3.12.3-3 +- Support MiniTest 5.19+ + * Fri Jul 21 2023 Fedora Release Engineering - 3.12.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7c847c593eea78e0b176df39e638f9ae3c6e2613 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 6 Aug 2023 16:59:40 +0900 Subject: [PATCH 19/33] Remove unneeded conditionals for new MiniTest support --- rubygem-rspec-expectations.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index aa007ec..71e7c7d 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -58,9 +58,7 @@ This package contains documentation for %{name}. gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec # MiniTest 5.19+ -%if 0%{?fedora} >= 39 grep -rl MiniTest spec/ | xargs sed -i 's|MiniTest::|Minitest::|' -%endif %build gem build %{gem_name}.gemspec @@ -114,6 +112,9 @@ cucumber \ %{gem_docdir} %changelog +* Sun Aug 06 2023 Mamoru TASAKA - 3.12.3-4 +- Remove unneeded conditionals for new MiniTest support + * Fri Aug 4 2023 Mamoru TASAKA - 3.12.3-3 - Support MiniTest 5.19+ From d0f411104eebc5263e3303005bbd71ae2858cd32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:26:33 +0000 Subject: [PATCH 20/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-rspec-expectations.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 71e7c7d..8dd4c5d 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -112,6 +112,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 3.12.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Aug 06 2023 Mamoru TASAKA - 3.12.3-4 - Remove unneeded conditionals for new MiniTest support From 0053c410ee5aae2e701c89f90490d6056dfb1520 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2024 15:22:52 +0900 Subject: [PATCH 21/33] 3.13.0 --- rubygem-rspec-expectations.spec | 12 ++++++------ sources | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 8dd4c5d..798bee7 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,13 +1,13 @@ -%global majorver 3.12.3 +%global majorver 3.13.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 5 +%global baserelease 1 %global gem_name rspec-expectations -%bcond_with bootstrap +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -57,9 +57,6 @@ This package contains documentation for %{name}. gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec -# MiniTest 5.19+ -grep -rl MiniTest spec/ | xargs sed -i 's|MiniTest::|Minitest::|' - %build gem build %{gem_name}.gemspec %gem_install @@ -112,6 +109,9 @@ cucumber \ %{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.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index afe8468..c6ed529 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.12.3.gem) = 58717c22078f09b9b5fce785cbc2b210a513067ede9210bc6391bc06325dfc8c1f6ffeffacbeed955ec556bada210b36ec236e49249dce96d3d20ed61258d009 -SHA512 (rubygem-rspec-expectations-3.12.3-full.tar.gz) = 6e826663a939502705317cc1214a74741bc8c65e6971ae7b651958be5582ac6d4a097911c602034321c2efeb5b02fd7d26a33ce52dd631bc8be74483018ccf02 +SHA512 (rspec-expectations-3.13.0.gem) = 926f6d54df2258f45ba53f8be90cb5af8a6b74634288ef82a511690ba27614bc283c4e262889e80469c8b48c2c770310402b17f1dd7bca28a24624c4a7d47de2 +SHA512 (rubygem-rspec-expectations-3.13.0-full.tar.gz) = 4623b5f2e539f42e0d19a64234731fdd288cf9888500e32a54f383e261cdc06f7619bf2d98b11c31e88a3ed0bf3f3d180000d2b9c02e179464c705cb641a58f6 From cfa15bf1506dca52b5795759ca6d4759ba971680 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2024 15:46:09 +0900 Subject: [PATCH 22/33] enable test again --- rubygem-rspec-expectations.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 798bee7..4c92afb 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -7,7 +7,7 @@ %global gem_name rspec-expectations -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 484414a84660a5d3b9812bc386f5f15c80570121 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 18 Jun 2024 17:39:22 +0900 Subject: [PATCH 23/33] 3.13.1 --- rubygem-rspec-expectations.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 4c92afb..b1a61ba 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.0 +%global majorver 3.13.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -109,6 +109,9 @@ cucumber \ %{gem_docdir} %changelog +* Tue Jun 18 2024 Mamoru TASAKA - 3.13.1-1 +- 3.13.1 + * Fri Feb 09 2024 Mamoru TASAKA - 3.13.0-1 - 3.13.0 diff --git a/sources b/sources index c6ed529..058cf0a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.13.0.gem) = 926f6d54df2258f45ba53f8be90cb5af8a6b74634288ef82a511690ba27614bc283c4e262889e80469c8b48c2c770310402b17f1dd7bca28a24624c4a7d47de2 -SHA512 (rubygem-rspec-expectations-3.13.0-full.tar.gz) = 4623b5f2e539f42e0d19a64234731fdd288cf9888500e32a54f383e261cdc06f7619bf2d98b11c31e88a3ed0bf3f3d180000d2b9c02e179464c705cb641a58f6 +SHA512 (rspec-expectations-3.13.1.gem) = 0d7aab480a34b135d1972250eff4bd15ed458c4db3a0d241e3388473c1b01b86245ad8423053e03eedf9cfecca393c6b020737f33af3f1e25d2289aa727fe3f8 +SHA512 (rubygem-rspec-expectations-3.13.1-full.tar.gz) = 9d08785e2ef099cad931df714dfcc5c302a75c9a6e1f5d56b45c634237fa58d28053c6a15c5f307fad09dac596107ed44c3e590825a1caaa3635d7ba3a59b615 From 442e52154e567e57452e603f551ccc0c4fec4aee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:54:46 +0000 Subject: [PATCH 24/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-rspec-expectations.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index b1a61ba..646ac26 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -109,6 +109,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 18 2024 Mamoru TASAKA - 3.13.1-1 - 3.13.1 From ad1a3f6a21d8d9e7145a68a57abda648335b55ff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 23 Aug 2024 10:55:55 +0900 Subject: [PATCH 25/33] 3.13.2 3.13.2 --- rubygem-rspec-expectations.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 646ac26..c78bda2 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.1 +%global majorver 3.13.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-expectations @@ -109,6 +109,9 @@ cucumber \ %{gem_docdir} %changelog +* Wed Aug 21 2024 Mamoru TASAKA - 3.13.2-1 +- 3.13.2 + * Fri Jul 19 2024 Fedora Release Engineering - 3.13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 058cf0a..1a1978e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.13.1.gem) = 0d7aab480a34b135d1972250eff4bd15ed458c4db3a0d241e3388473c1b01b86245ad8423053e03eedf9cfecca393c6b020737f33af3f1e25d2289aa727fe3f8 -SHA512 (rubygem-rspec-expectations-3.13.1-full.tar.gz) = 9d08785e2ef099cad931df714dfcc5c302a75c9a6e1f5d56b45c634237fa58d28053c6a15c5f307fad09dac596107ed44c3e590825a1caaa3635d7ba3a59b615 +SHA512 (rspec-expectations-3.13.2.gem) = 6b122d5647142bb317a56fb1ce572fc2a8b650e7cb37a2be302aa4fdc2afee4113130a5853263a17b8fa80a66e66d01812949a137376112a1b85a31718b44830 +SHA512 (rubygem-rspec-expectations-3.13.2-full.tar.gz) = 41a5d3895f3dc1e065aeebc5d5333fa110ecd6cdc96ed6b179445ac0946fbe5a797a9746d567ffe9b492fb14de858713201ed2696437c14bb87593dd18cf17df From b3f9cf0c020ac60fdd323ff17fd754421f3a53ea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 9 Sep 2024 15:07:07 +0900 Subject: [PATCH 26/33] 3.13.3 3.13.3 --- rubygem-rspec-expectations.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index c78bda2..63fc08b 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.2 +%global majorver 3.13.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -109,6 +109,9 @@ cucumber \ %{gem_docdir} %changelog +* Sun Sep 08 2024 Mamoru TASAKA - 3.13.3-1 +- 3.13.3 + * Wed Aug 21 2024 Mamoru TASAKA - 3.13.2-1 - 3.13.2 diff --git a/sources b/sources index 1a1978e..9f247d2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.13.2.gem) = 6b122d5647142bb317a56fb1ce572fc2a8b650e7cb37a2be302aa4fdc2afee4113130a5853263a17b8fa80a66e66d01812949a137376112a1b85a31718b44830 -SHA512 (rubygem-rspec-expectations-3.13.2-full.tar.gz) = 41a5d3895f3dc1e065aeebc5d5333fa110ecd6cdc96ed6b179445ac0946fbe5a797a9746d567ffe9b492fb14de858713201ed2696437c14bb87593dd18cf17df +SHA512 (rspec-expectations-3.13.3.gem) = 887d378bccf08f8f42dd3b580dc67dac0d91b7e08a23ab924bd8d618fae2f37132048b473a288a9f1c40096271e4312c28fc91383a074eda53d62939bb8c58fe +SHA512 (rubygem-rspec-expectations-3.13.3-full.tar.gz) = 0bd40f246fe44c76e489a7af44d5ccdad0ad346c6e8b1ec0c623d61f02e15fa70a3c014360a517b71be2b1a3adf261c079ebe0d198c5692a3c34fc8269495d9d From 7e36ca6a61c1c5211e28ad24fdfc185b720b9817 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 29 Dec 2024 11:05:22 +0900 Subject: [PATCH 27/33] Backport upstream fix to support ruby34 Hash inspect syntax --- ...xpectations-pr164-ruby34-hash-syntax.patch | 393 ++++++++++++++++++ rubygem-rspec-expectations.spec | 9 +- 2 files changed, 401 insertions(+), 1 deletion(-) create mode 100644 rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch diff --git a/rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch b/rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch new file mode 100644 index 0000000..f385bfb --- /dev/null +++ b/rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch @@ -0,0 +1,393 @@ +From f1b04eec3b696c9a9134b6ed9ef11ac70356e57f Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Wed, 25 Dec 2024 11:14:19 +0000 +Subject: [PATCH 2/2] Fixes for rspec-expectations hash syntax + +--- + .../built_in_matchers/include.feature | 4 +- + .../built_in_matchers/predicates.feature | 2 +- + .../step_definitions/additional_cli_steps.rb | 26 +++++++ + .../spec/rspec/matchers/aliases_spec.rb | 6 +- + .../rspec/matchers/built_in/captures_spec.rb | 4 +- + .../spec/rspec/matchers/built_in/eq_spec.rb | 2 +- + .../spec/rspec/matchers/built_in/has_spec.rb | 4 +- + .../matchers/built_in/have_attributes_spec.rb | 16 +++- + .../rspec/matchers/built_in/include_spec.rb | 74 +++++++++++++------ + 9 files changed, 102 insertions(+), 36 deletions(-) + +diff --git a/rspec-expectations/features/built_in_matchers/include.feature b/rspec-expectations/features/built_in_matchers/include.feature +index 295d9b60f..012307135 100644 +--- a/rspec-expectations/features/built_in_matchers/include.feature ++++ b/rspec-expectations/features/built_in_matchers/include.feature +@@ -139,7 +139,7 @@ Feature: `include` matcher + end + """ + When I run `rspec hash_include_matcher_spec.rb` +- Then the output should contain all of these: ++ Then the output should contain all of these, ignoring hash syntax: + | 22 examples, 13 failures | + | expected {:a => 7, :b => 5} not to include :a | + | expected {:a => 7, :b => 5} not to include :b and :a | +@@ -176,7 +176,7 @@ Feature: `include` matcher + end + """ + When I run `rspec include_matcher_with_counts_spec.rb` +- Then the output should contain all of these: ++ Then the output should contain all of these, ignoring hash syntax: + | 12 examples, 4 failures | + | expected [{:c => 7}, {:a => 1}, {:b => 2}, {:c => 1}, {:a => 3}, {:c => 7}] not to include (have key :b) once | + | expected [{:c => 7}, {:a => 1}, {:b => 2}, {:c => 1}, {:a => 3}, {:c => 7}] not to include (have key :a) twice | +diff --git a/rspec-expectations/features/built_in_matchers/predicates.feature b/rspec-expectations/features/built_in_matchers/predicates.feature +index 0c3b33c5e..282c7a853 100644 +--- a/rspec-expectations/features/built_in_matchers/predicates.feature ++++ b/rspec-expectations/features/built_in_matchers/predicates.feature +@@ -88,7 +88,7 @@ Feature: Predicate matchers + """ + When I run `rspec should_have_key_spec.rb` + Then the output should contain "2 examples, 1 failure" +- And the output should contain "expected `{:foo=>7}.has_key?(:bar)` to be truthy, got false" ++ And the output should contain, ignoring hash syntax, "expected `{:foo=>7}.has_key?(:bar)` to be truthy, got false" + + Scenario: Expecting `subject` to have all decimals (based on custom `has_decimals?` method) + Given a file named "should_not_have_all_string_keys_spec.rb" with: +diff --git a/rspec-expectations/features/step_definitions/additional_cli_steps.rb b/rspec-expectations/features/step_definitions/additional_cli_steps.rb +index 2ab176f60..c016e0ea8 100644 +--- a/rspec-expectations/features/step_definitions/additional_cli_steps.rb ++++ b/rspec-expectations/features/step_definitions/additional_cli_steps.rb +@@ -28,3 +28,29 @@ + step 'the output should contain "1 failure"' + step 'the exit status should not be 0' + end ++ ++Then(/^the output should contain, ignoring hash syntax, "(.*)"$/) do |output| ++ if RUBY_VERSION.to_f > 3.3 ++ expect(all_output).to include(output.gsub(/:(\w+)=>/, '\1: ')) ++ else ++ expect(all_output).to include(output) ++ end ++end ++ ++RSpec::Matchers.define :match_table do |lines| ++ match do |all_output| ++ lines.all? { |line| all_output.include?(line) } ++ end ++ ++ diffable ++end ++ ++Then "the output should contain all of these, ignoring hash syntax:" do |table| ++ lines = table.raw.flatten.reject(&:empty?) ++ ++ if RUBY_VERSION.to_f > 3.3 ++ lines = lines.map { |line| line.gsub(/:(\w+)\s+=>\s+/, '\1: ') } ++ end ++ ++ expect(all_output).to match_table(lines) ++end +diff --git a/rspec-expectations/spec/rspec/matchers/aliases_spec.rb b/rspec-expectations/spec/rspec/matchers/aliases_spec.rb +index 1b7b0d2ac..aeaca6a63 100644 +--- a/rspec-expectations/spec/rspec/matchers/aliases_spec.rb ++++ b/rspec-expectations/spec/rspec/matchers/aliases_spec.rb +@@ -219,7 +219,7 @@ module RSpec + an_object_having_attributes(:age => 32) + ).to be_aliased_to( + have_attributes(:age => 32) +- ).with_description("an object having attributes {:age => 32}") ++ ).with_description("an object having attributes #{hash_inspect({ :age => 32 })}") + end + + specify do +@@ -227,7 +227,7 @@ module RSpec + having_attributes(:age => 32) + ).to be_aliased_to( + have_attributes(:age => 32) +- ).with_description("having attributes {:age => 32}") ++ ).with_description("having attributes #{hash_inspect({ :age => 32 })}") + end + + specify do +@@ -251,7 +251,7 @@ module RSpec + a_hash_including(:a => 5) + ).to be_aliased_to( + include(:a => 5) +- ).with_description('a hash including {:a => 5}') ++ ).with_description("a hash including #{hash_inspect({ :a => 5 })}") + end + + specify do +diff --git a/rspec-expectations/spec/rspec/matchers/built_in/captures_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/captures_spec.rb +index b8656f1cc..609326e48 100644 +--- a/rspec-expectations/spec/rspec/matchers/built_in/captures_spec.rb ++++ b/rspec-expectations/spec/rspec/matchers/built_in/captures_spec.rb +@@ -36,7 +36,7 @@ + it "has a sensible failure description with a hash including matcher" do + expect { + expect("a123a").not_to match(Regexp.new("(?123)(asdf)?")).with_captures(a_hash_including(:num => "123")) +- }.to fail_with(/num => "123"/) ++ }.to fail_with(/#{hash_inspect({ :num => "123" })}/) + end + + it "matches named captures when not passing a hash" do +@@ -80,7 +80,7 @@ + it "has a sensible failure description with a hash including matcher" do + expect { + expect(Regexp.new("(?123)(asdf)?")).not_to match("a123a").with_captures(a_hash_including(:num => "123")) +- }.to fail_with(/num => "123"/) ++ }.to fail_with(/#{hash_inspect({ :num => "123" })}/) + end + + it "matches named captures when not passing a hash" do +diff --git a/rspec-expectations/spec/rspec/matchers/built_in/eq_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/eq_spec.rb +index ad03c1f1d..b1ab6aa5c 100644 +--- a/rspec-expectations/spec/rspec/matchers/built_in/eq_spec.rb ++++ b/rspec-expectations/spec/rspec/matchers/built_in/eq_spec.rb +@@ -120,7 +120,7 @@ module Matchers + ['foo', 'eq "foo"'], + [/regex/, 'eq /regex/'], + [['foo'], 'eq ["foo"]'], +- [{ :foo => :bar }, 'eq {:foo=>:bar}'], ++ [{ :foo => :bar }, "eq #{{ :foo=>:bar }.inspect}"], + [Class, 'eq Class'], + [RSpec, 'eq RSpec'], + [Time.utc(2014, 1, 1), "eq 2014-01-01 00:00:00.#{expected_seconds} +0000"], +diff --git a/rspec-expectations/spec/rspec/matchers/built_in/has_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/has_spec.rb +index 190817828..bf6054dbf 100644 +--- a/rspec-expectations/spec/rspec/matchers/built_in/has_spec.rb ++++ b/rspec-expectations/spec/rspec/matchers/built_in/has_spec.rb +@@ -31,7 +31,7 @@ + it "fails if #has_sym?(*args) returns false" do + expect { + expect({ :b => "B" }).to have_key(:a) +- }.to fail_with('expected `{:b=>"B"}.has_key?(:a)` to return true, got false') ++ }.to fail_with("expected `#{{ :b=>"B" }.inspect}.has_key?(:a)` to return true, got false") + end + + obj_with_block_method = Object.new +@@ -180,7 +180,7 @@ def o.has_sym?(sym); sym == :foo; end + it "fails if #has_sym?(*args) returns true" do + expect { + expect({ :a => "A" }).not_to have_key(:a) +- }.to fail_with('expected `{:a=>"A"}.has_key?(:a)` to return false, got true') ++ }.to fail_with("expected `#{{ :a=>"A" }.inspect}.has_key?(:a)` to return false, got true") + end + + it "fails if target does not respond to #has_sym?" do +diff --git a/rspec-expectations/spec/rspec/matchers/built_in/have_attributes_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/have_attributes_spec.rb +index 92e803b63..aad08effe 100644 +--- a/rspec-expectations/spec/rspec/matchers/built_in/have_attributes_spec.rb ++++ b/rspec-expectations/spec/rspec/matchers/built_in/have_attributes_spec.rb +@@ -108,13 +108,25 @@ def count + + it 'provides a description' do + description = have_attributes(:age => (a_value > 30)).description +- expect(description).to eq("have attributes {:age => (a value > 30)}") ++ expect(description).to eq( ++ if RUBY_VERSION.to_f > 3.3 ++ "have attributes {age: (a value > 30)}" ++ else ++ "have attributes {:age => (a value > 30)}" ++ end ++ ) + end + + it "fails with a clear message when the matcher does not match" do + expect { + expect(person).to have_attributes(:age => (a_value < 10)) +- }.to fail_including("expected #{object_inspect person} to have attributes {:age => (a value < 10)}") ++ }.to fail_including( ++ if RUBY_VERSION.to_f > 3.3 ++ "expected #{object_inspect person} to have attributes {age: (a value < 10)}" ++ else ++ "expected #{object_inspect person} to have attributes {:age => (a value < 10)}" ++ end ++ ) + end + end + end +diff --git a/rspec-expectations/spec/rspec/matchers/built_in/include_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/include_spec.rb +index e760a3a46..19aba9673 100644 +--- a/rspec-expectations/spec/rspec/matchers/built_in/include_spec.rb ++++ b/rspec-expectations/spec/rspec/matchers/built_in/include_spec.rb +@@ -69,8 +69,12 @@ def use_string_keys_in_failure_message? + false + end + +- def convert_key(key) +- use_string_keys_in_failure_message? ? "\"#{key}\"" : ":#{key}" ++ def converted_key_hash_inspect(key, value) ++ if use_string_keys_in_failure_message? ++ hash_inspect({ key.to_s => value }) ++ else ++ hash_inspect({ key => value }) ++ end + end + + it 'passes if target has the expected as a key' do +@@ -82,7 +86,8 @@ def convert_key(key) + end + + it "fails if target does not include expected" do +- failure_string = %(expected {#{convert_key(:key)} => "value"} to include :other) ++ failure_string = %(expected #{converted_key_hash_inspect(:key, "value")} to include :other) ++ + expect { + expect(build_target(:key => 'value')).to include(:other) + }.to fail_matching(failure_string) +@@ -91,7 +96,7 @@ def convert_key(key) + it "fails if target doesn't have a key and we expect nil" do + expect { + expect(build_target({})).to include(:something => nil) +- }.to fail_matching("expected {} to include {:something => nil}") ++ }.to fail_matching("expected {} to include #{hash_inspect({ :something => nil })}") + end + + it 'works even when an entry in the hash overrides #send' do +@@ -480,12 +485,23 @@ class PseudoHash < SimpleDelegator + { :number => 0 }, + { :number => 3 } + ) +- }.to fail_including(dedent(<<-END)) +- |Diff: +- |@@ #{one_line_header} @@ +- |-[{:number=>1}, {:number=>0}, {:number=>3}] +- |+[{:number=>1}, {:number=>2}, {:number=>3}] +- END ++ }.to fail_including( ++ if RUBY_VERSION.to_f > 3.3 ++ dedent(<<-END) ++ |Diff: ++ |@@ #{one_line_header} @@ ++ |-[{number: 1}, {number: 0}, {number: 3}] ++ |+[{number: 1}, {number: 2}, {number: 3}] ++ END ++ else ++ dedent(<<-END) ++ |Diff: ++ |@@ #{one_line_header} @@ ++ |-[{:number=>1}, {:number=>0}, {:number=>3}] ++ |+[{:number=>1}, {:number=>2}, {:number=>3}] ++ END ++ end ++ ) + end + end + +@@ -632,7 +648,7 @@ class PseudoHash < SimpleDelegator + it "fails if target includes expected key" do + expect { + expect({ :key => 'value' }).not_to include(:key) +- }.to fail_matching('expected {:key => "value"} not to include :key') ++ }.to fail_matching("expected #{hash_inspect({ :key => "value" })} not to include :key") + end + end + +@@ -751,13 +767,13 @@ class PseudoHash < SimpleDelegator + it "fails if target has a different value for key" do + expect { + expect({ :key => 'different' }).to include(:key => 'value') +- }.to fail_matching('expected {:key => "different"} to include {:key => "value"}') ++ }.to fail_matching("expected #{hash_inspect({ :key => "different" })} to include #{hash_inspect({ :key => "value" })}") + end + + it "fails if target has a different key" do + expect { + expect({ :other => 'value' }).to include(:key => 'value') +- }.to fail_matching('expected {:other => "value"} to include {:key => "value"}') ++ }.to fail_matching("expected #{hash_inspect({ :other => "value" })} to include #{hash_inspect({ :key => "value" })}") + end + end + +@@ -765,7 +781,7 @@ class PseudoHash < SimpleDelegator + it "fails if the target does not contain the given hash" do + expect { + expect(['a', 'b']).to include(:key => 'value') +- }.to fail_matching('expected ["a", "b"] to include {:key => "value"}') ++ }.to fail_matching("expected [\"a\", \"b\"] to include #{hash_inspect({ :key => "value" })}") + end + + it "passes if the target contains the given hash" do +@@ -779,13 +795,13 @@ class PseudoHash < SimpleDelegator + it "fails if target includes the key/value pair" do + expect { + expect({ :key => 'value' }).not_to include(:key => 'value') +- }.to fail_matching('expected {:key => "value"} not to include {:key => "value"}') ++ }.to fail_matching("expected #{hash_inspect({ :key => "value" })} not to include #{hash_inspect({ :key => "value" })}") + end + + it "fails if target includes the key/value pair among others" do + expect { + expect({ :key => 'value', :other => 'different' }).not_to include(:key => 'value') +- }.to fail_with(%r|expected #{hash_inspect :key => "value", :other => "different"} not to include \{:key => "value"\}|) ++ }.to fail_with(%r|expected #{hash_inspect(:key => "value", :other => "different")} not to include #{hash_inspect({ :key => "value" })}|) + end + + it "passes if target has a different value for key" do +@@ -805,7 +821,7 @@ class PseudoHash < SimpleDelegator + it "fails if the target contains the given hash" do + expect { + expect(['a', { :key => 'value' }]).not_to include(:key => 'value') +- }.to fail_matching('expected ["a", {:key => "value"}] not to include {:key => "value"}') ++ }.to fail_matching("expected [\"a\", #{hash_inspect({ :key => "value" })}] not to include #{hash_inspect({ :key => "value" })}") + end + end + end +@@ -982,13 +998,25 @@ def matches?(_) + + it 'provides a description' do + description = include(:a => a_value_within(3).of(10)).description +- expect(description).to eq("include {:a => (a value within 3 of 10)}") ++ expect(description).to eq( ++ if RUBY_VERSION.to_f > 3.3 ++ "include {a: (a value within 3 of 10)}" ++ else ++ "include {:a => (a value within 3 of 10)}" ++ end ++ ) + end + + it "fails with a clear message when the matcher does not match" do + expect { + expect(:a => 15).to include(:a => a_value_within(3).of(10)) +- }.to fail_matching("expected {:a => 15} to include {:a => (a value within 3 of 10)}") ++ }.to fail_matching( ++ if RUBY_VERSION.to_f > 3.3 ++ "expected {a: 15} to include {a: (a value within 3 of 10)}" ++ else ++ "expected {:a => 15} to include {:a => (a value within 3 of 10)}" ++ end ++ ) + end + end + +@@ -1005,7 +1033,7 @@ def matches?(_) + it 'fails with a clear message when the matcher does not match', :if => (RUBY_VERSION.to_f > 1.8) do + expect { + expect(:drink => "water", :food => "bread").to include(match(/bar/)) +- }.to fail_matching('expected {:drink => "water", :food => "bread"} to include (match /bar/)') ++ }.to fail_matching("expected #{hash_inspect({ :drink => "water", :food => "bread" })} to include (match /bar/)") + end + end + +@@ -1034,19 +1062,19 @@ def matches?(_) + it 'fails with a clear message when the value does not match', :if => (RUBY_VERSION.to_f > 1.8) do + expect { + expect(:drink => "water", :food => "bread").to include(match(/foo/) => "meat") +- }.to fail_matching('expected {:drink => "water", :food => "bread"} to include {(match /foo/) => "meat"}') ++ }.to fail_matching("expected #{hash_inspect({ :drink => "water", :food => "bread" })} to include {(match /foo/) => \"meat\"}") + end + + it 'fails with a clear message when the matcher does not match', :if => (RUBY_VERSION.to_f > 1.8) do + expect { + expect(:drink => "water", :food => "bread").to include(match(/bar/) => "bread") +- }.to fail_matching('expected {:drink => "water", :food => "bread"} to include {(match /bar/) => "bread"}') ++ }.to fail_matching("expected #{hash_inspect({ :drink => "water", :food => "bread" })} to include {(match /bar/) => \"bread\"}") + end + + it 'fails with a clear message when several matchers do not match', :if => (RUBY_VERSION.to_f > 1.8) do + expect { + expect(:drink => "water", :food => "bread").to include(match(/bar/) => "bread", match(/baz/) => "water") +- }.to fail_matching('expected {:drink => "water", :food => "bread"} to include {(match /bar/) => "bread", (match /baz/) => "water"}') ++ }.to fail_matching("expected #{hash_inspect({ :drink => "water", :food => "bread" })} to include {(match /bar/) => \"bread\", (match /baz/) => \"water\"}") + end + end + diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 63fc08b..2867913 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -23,6 +23,9 @@ Source0: https://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 +# https://github.com/rspec/rspec/pull/164 +# Support ruby34 Hash#inspect syntax +Patch0: rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -54,6 +57,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 +%patch -P0 -p2 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec @@ -109,6 +113,9 @@ cucumber \ %{gem_docdir} %changelog +* Sun Dec 29 2024 Mamoru TASAKA - 3.13.3-2 +- Backport upstream fix to support ruby34 Hash inspect syntax + * Sun Sep 08 2024 Mamoru TASAKA - 3.13.3-1 - 3.13.3 From 25ee37d90730df77f8a58a750af59550b4742c7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:57:32 +0000 Subject: [PATCH 28/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-rspec-expectations.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 2867913..0416196 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -113,6 +113,9 @@ cucumber \ %{gem_docdir} %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.13.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Dec 29 2024 Mamoru TASAKA - 3.13.3-2 - Backport upstream fix to support ruby34 Hash inspect syntax From f0a6901ca440480c2381f739f6a0d8be84c990dc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 May 2025 14:49:14 +0900 Subject: [PATCH 29/33] 3.13.4 --- rspec-related-create-full-tarball.sh | 7 +- ...tions-3.13.4-diff_spec-format-revert.patch | 66 +++ ...xpectations-pr164-ruby34-hash-syntax.patch | 393 ------------------ rubygem-rspec-expectations.spec | 16 +- sources | 4 +- 5 files changed, 81 insertions(+), 405 deletions(-) create mode 100644 rubygem-rspec-expectations-3.13.4-diff_spec-format-revert.patch delete mode 100644 rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch 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-expectations-3.13.4-diff_spec-format-revert.patch b/rubygem-rspec-expectations-3.13.4-diff_spec-format-revert.patch new file mode 100644 index 0000000..3133341 --- /dev/null +++ b/rubygem-rspec-expectations-3.13.4-diff_spec-format-revert.patch @@ -0,0 +1,66 @@ +--- rspec-expectations-3.13.4/spec/rspec/matchers/built_in/include_spec.rb 2025-05-15 11:40:49.000000000 +0900 ++++ rspec-expectations-3.13.3/spec/rspec/matchers/built_in/include_spec.rb 2024-09-08 16:39:38.000000000 +0900 +@@ -109,7 +104,7 @@ RSpec.describe "#include matcher" do + failure_string = if use_string_keys_in_failure_message? + dedent(<<-END) + |Diff: +- |@@ #{one_line_header(3)} @@ ++ |@@ -1,3 +1,3 @@ + |-:bar => 3, + |-:foo => 1, + |+"bar" => 2, +@@ -137,7 +132,7 @@ RSpec.describe "#include matcher" do + failure_string = if use_string_keys_in_failure_message? + dedent(<<-END) + |Diff: +- |@@ #{one_line_header(3)} @@ ++ |@@ -1,3 +1,3 @@ + |-(match /FOO/i) => 1, + |-:bar => 3, + |+"bar" => 2, +@@ -146,7 +141,7 @@ RSpec.describe "#include matcher" do + else + dedent(<<-END) + |Diff: +- |@@ #{one_line_header(3)} @@ ++ |@@ -1,3 +1,3 @@ + |-(match /FOO/i) => 1, + |-:bar => 3, + |+:bar => 2, +--- rspec-expectations-3.13.4/spec/rspec/matchers/built_in/compound_spec.rb 2025-05-15 11:40:49.000000000 +0900 ++++ rspec-expectations-3.13.3/spec/rspec/matchers/built_in/compound_spec.rb 2024-09-08 16:39:38.000000000 +0900 +@@ -596,14 +595,14 @@ module RSpec::Matchers::BuiltIn + | + | expected "HELLO\\nWORLD" to eq downcase "hola\\nmon" + |Diff for (eq downcase "bonjour\\nmonde"): +- |@@ #{one_line_header(3)} @@ ++ |@@ -1,3 +1,3 @@ + |-bonjour + |-monde + |+hello + |+world + | + |Diff for (eq downcase "hola\\nmon"): +- |@@ #{one_line_header(3)} @@ ++ |@@ -1,3 +1,3 @@ + |-hola + |-mon + |+hello +@@ -639,14 +638,14 @@ module RSpec::Matchers::BuiltIn + | + | expected "hello\\nworld" to eq downcase "hola\\nmon" + |Diff for (eq downcase "bonjour\\nmonde"): +- |@@ #{one_line_header(3)} @@ ++ |@@ -1,3 +1,3 @@ + |-bonjour + |-monde + |+hello + |+world + | + |Diff for (eq downcase "hola\\nmon"): +- |@@ #{one_line_header(3)} @@ ++ |@@ -1,3 +1,3 @@ + |-hola + |-mon + |+hello + diff --git a/rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch b/rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch deleted file mode 100644 index f385bfb..0000000 --- a/rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch +++ /dev/null @@ -1,393 +0,0 @@ -From f1b04eec3b696c9a9134b6ed9ef11ac70356e57f Mon Sep 17 00:00:00 2001 -From: Jon Rowe -Date: Wed, 25 Dec 2024 11:14:19 +0000 -Subject: [PATCH 2/2] Fixes for rspec-expectations hash syntax - ---- - .../built_in_matchers/include.feature | 4 +- - .../built_in_matchers/predicates.feature | 2 +- - .../step_definitions/additional_cli_steps.rb | 26 +++++++ - .../spec/rspec/matchers/aliases_spec.rb | 6 +- - .../rspec/matchers/built_in/captures_spec.rb | 4 +- - .../spec/rspec/matchers/built_in/eq_spec.rb | 2 +- - .../spec/rspec/matchers/built_in/has_spec.rb | 4 +- - .../matchers/built_in/have_attributes_spec.rb | 16 +++- - .../rspec/matchers/built_in/include_spec.rb | 74 +++++++++++++------ - 9 files changed, 102 insertions(+), 36 deletions(-) - -diff --git a/rspec-expectations/features/built_in_matchers/include.feature b/rspec-expectations/features/built_in_matchers/include.feature -index 295d9b60f..012307135 100644 ---- a/rspec-expectations/features/built_in_matchers/include.feature -+++ b/rspec-expectations/features/built_in_matchers/include.feature -@@ -139,7 +139,7 @@ Feature: `include` matcher - end - """ - When I run `rspec hash_include_matcher_spec.rb` -- Then the output should contain all of these: -+ Then the output should contain all of these, ignoring hash syntax: - | 22 examples, 13 failures | - | expected {:a => 7, :b => 5} not to include :a | - | expected {:a => 7, :b => 5} not to include :b and :a | -@@ -176,7 +176,7 @@ Feature: `include` matcher - end - """ - When I run `rspec include_matcher_with_counts_spec.rb` -- Then the output should contain all of these: -+ Then the output should contain all of these, ignoring hash syntax: - | 12 examples, 4 failures | - | expected [{:c => 7}, {:a => 1}, {:b => 2}, {:c => 1}, {:a => 3}, {:c => 7}] not to include (have key :b) once | - | expected [{:c => 7}, {:a => 1}, {:b => 2}, {:c => 1}, {:a => 3}, {:c => 7}] not to include (have key :a) twice | -diff --git a/rspec-expectations/features/built_in_matchers/predicates.feature b/rspec-expectations/features/built_in_matchers/predicates.feature -index 0c3b33c5e..282c7a853 100644 ---- a/rspec-expectations/features/built_in_matchers/predicates.feature -+++ b/rspec-expectations/features/built_in_matchers/predicates.feature -@@ -88,7 +88,7 @@ Feature: Predicate matchers - """ - When I run `rspec should_have_key_spec.rb` - Then the output should contain "2 examples, 1 failure" -- And the output should contain "expected `{:foo=>7}.has_key?(:bar)` to be truthy, got false" -+ And the output should contain, ignoring hash syntax, "expected `{:foo=>7}.has_key?(:bar)` to be truthy, got false" - - Scenario: Expecting `subject` to have all decimals (based on custom `has_decimals?` method) - Given a file named "should_not_have_all_string_keys_spec.rb" with: -diff --git a/rspec-expectations/features/step_definitions/additional_cli_steps.rb b/rspec-expectations/features/step_definitions/additional_cli_steps.rb -index 2ab176f60..c016e0ea8 100644 ---- a/rspec-expectations/features/step_definitions/additional_cli_steps.rb -+++ b/rspec-expectations/features/step_definitions/additional_cli_steps.rb -@@ -28,3 +28,29 @@ - step 'the output should contain "1 failure"' - step 'the exit status should not be 0' - end -+ -+Then(/^the output should contain, ignoring hash syntax, "(.*)"$/) do |output| -+ if RUBY_VERSION.to_f > 3.3 -+ expect(all_output).to include(output.gsub(/:(\w+)=>/, '\1: ')) -+ else -+ expect(all_output).to include(output) -+ end -+end -+ -+RSpec::Matchers.define :match_table do |lines| -+ match do |all_output| -+ lines.all? { |line| all_output.include?(line) } -+ end -+ -+ diffable -+end -+ -+Then "the output should contain all of these, ignoring hash syntax:" do |table| -+ lines = table.raw.flatten.reject(&:empty?) -+ -+ if RUBY_VERSION.to_f > 3.3 -+ lines = lines.map { |line| line.gsub(/:(\w+)\s+=>\s+/, '\1: ') } -+ end -+ -+ expect(all_output).to match_table(lines) -+end -diff --git a/rspec-expectations/spec/rspec/matchers/aliases_spec.rb b/rspec-expectations/spec/rspec/matchers/aliases_spec.rb -index 1b7b0d2ac..aeaca6a63 100644 ---- a/rspec-expectations/spec/rspec/matchers/aliases_spec.rb -+++ b/rspec-expectations/spec/rspec/matchers/aliases_spec.rb -@@ -219,7 +219,7 @@ module RSpec - an_object_having_attributes(:age => 32) - ).to be_aliased_to( - have_attributes(:age => 32) -- ).with_description("an object having attributes {:age => 32}") -+ ).with_description("an object having attributes #{hash_inspect({ :age => 32 })}") - end - - specify do -@@ -227,7 +227,7 @@ module RSpec - having_attributes(:age => 32) - ).to be_aliased_to( - have_attributes(:age => 32) -- ).with_description("having attributes {:age => 32}") -+ ).with_description("having attributes #{hash_inspect({ :age => 32 })}") - end - - specify do -@@ -251,7 +251,7 @@ module RSpec - a_hash_including(:a => 5) - ).to be_aliased_to( - include(:a => 5) -- ).with_description('a hash including {:a => 5}') -+ ).with_description("a hash including #{hash_inspect({ :a => 5 })}") - end - - specify do -diff --git a/rspec-expectations/spec/rspec/matchers/built_in/captures_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/captures_spec.rb -index b8656f1cc..609326e48 100644 ---- a/rspec-expectations/spec/rspec/matchers/built_in/captures_spec.rb -+++ b/rspec-expectations/spec/rspec/matchers/built_in/captures_spec.rb -@@ -36,7 +36,7 @@ - it "has a sensible failure description with a hash including matcher" do - expect { - expect("a123a").not_to match(Regexp.new("(?123)(asdf)?")).with_captures(a_hash_including(:num => "123")) -- }.to fail_with(/num => "123"/) -+ }.to fail_with(/#{hash_inspect({ :num => "123" })}/) - end - - it "matches named captures when not passing a hash" do -@@ -80,7 +80,7 @@ - it "has a sensible failure description with a hash including matcher" do - expect { - expect(Regexp.new("(?123)(asdf)?")).not_to match("a123a").with_captures(a_hash_including(:num => "123")) -- }.to fail_with(/num => "123"/) -+ }.to fail_with(/#{hash_inspect({ :num => "123" })}/) - end - - it "matches named captures when not passing a hash" do -diff --git a/rspec-expectations/spec/rspec/matchers/built_in/eq_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/eq_spec.rb -index ad03c1f1d..b1ab6aa5c 100644 ---- a/rspec-expectations/spec/rspec/matchers/built_in/eq_spec.rb -+++ b/rspec-expectations/spec/rspec/matchers/built_in/eq_spec.rb -@@ -120,7 +120,7 @@ module Matchers - ['foo', 'eq "foo"'], - [/regex/, 'eq /regex/'], - [['foo'], 'eq ["foo"]'], -- [{ :foo => :bar }, 'eq {:foo=>:bar}'], -+ [{ :foo => :bar }, "eq #{{ :foo=>:bar }.inspect}"], - [Class, 'eq Class'], - [RSpec, 'eq RSpec'], - [Time.utc(2014, 1, 1), "eq 2014-01-01 00:00:00.#{expected_seconds} +0000"], -diff --git a/rspec-expectations/spec/rspec/matchers/built_in/has_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/has_spec.rb -index 190817828..bf6054dbf 100644 ---- a/rspec-expectations/spec/rspec/matchers/built_in/has_spec.rb -+++ b/rspec-expectations/spec/rspec/matchers/built_in/has_spec.rb -@@ -31,7 +31,7 @@ - it "fails if #has_sym?(*args) returns false" do - expect { - expect({ :b => "B" }).to have_key(:a) -- }.to fail_with('expected `{:b=>"B"}.has_key?(:a)` to return true, got false') -+ }.to fail_with("expected `#{{ :b=>"B" }.inspect}.has_key?(:a)` to return true, got false") - end - - obj_with_block_method = Object.new -@@ -180,7 +180,7 @@ def o.has_sym?(sym); sym == :foo; end - it "fails if #has_sym?(*args) returns true" do - expect { - expect({ :a => "A" }).not_to have_key(:a) -- }.to fail_with('expected `{:a=>"A"}.has_key?(:a)` to return false, got true') -+ }.to fail_with("expected `#{{ :a=>"A" }.inspect}.has_key?(:a)` to return false, got true") - end - - it "fails if target does not respond to #has_sym?" do -diff --git a/rspec-expectations/spec/rspec/matchers/built_in/have_attributes_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/have_attributes_spec.rb -index 92e803b63..aad08effe 100644 ---- a/rspec-expectations/spec/rspec/matchers/built_in/have_attributes_spec.rb -+++ b/rspec-expectations/spec/rspec/matchers/built_in/have_attributes_spec.rb -@@ -108,13 +108,25 @@ def count - - it 'provides a description' do - description = have_attributes(:age => (a_value > 30)).description -- expect(description).to eq("have attributes {:age => (a value > 30)}") -+ expect(description).to eq( -+ if RUBY_VERSION.to_f > 3.3 -+ "have attributes {age: (a value > 30)}" -+ else -+ "have attributes {:age => (a value > 30)}" -+ end -+ ) - end - - it "fails with a clear message when the matcher does not match" do - expect { - expect(person).to have_attributes(:age => (a_value < 10)) -- }.to fail_including("expected #{object_inspect person} to have attributes {:age => (a value < 10)}") -+ }.to fail_including( -+ if RUBY_VERSION.to_f > 3.3 -+ "expected #{object_inspect person} to have attributes {age: (a value < 10)}" -+ else -+ "expected #{object_inspect person} to have attributes {:age => (a value < 10)}" -+ end -+ ) - end - end - end -diff --git a/rspec-expectations/spec/rspec/matchers/built_in/include_spec.rb b/rspec-expectations/spec/rspec/matchers/built_in/include_spec.rb -index e760a3a46..19aba9673 100644 ---- a/rspec-expectations/spec/rspec/matchers/built_in/include_spec.rb -+++ b/rspec-expectations/spec/rspec/matchers/built_in/include_spec.rb -@@ -69,8 +69,12 @@ def use_string_keys_in_failure_message? - false - end - -- def convert_key(key) -- use_string_keys_in_failure_message? ? "\"#{key}\"" : ":#{key}" -+ def converted_key_hash_inspect(key, value) -+ if use_string_keys_in_failure_message? -+ hash_inspect({ key.to_s => value }) -+ else -+ hash_inspect({ key => value }) -+ end - end - - it 'passes if target has the expected as a key' do -@@ -82,7 +86,8 @@ def convert_key(key) - end - - it "fails if target does not include expected" do -- failure_string = %(expected {#{convert_key(:key)} => "value"} to include :other) -+ failure_string = %(expected #{converted_key_hash_inspect(:key, "value")} to include :other) -+ - expect { - expect(build_target(:key => 'value')).to include(:other) - }.to fail_matching(failure_string) -@@ -91,7 +96,7 @@ def convert_key(key) - it "fails if target doesn't have a key and we expect nil" do - expect { - expect(build_target({})).to include(:something => nil) -- }.to fail_matching("expected {} to include {:something => nil}") -+ }.to fail_matching("expected {} to include #{hash_inspect({ :something => nil })}") - end - - it 'works even when an entry in the hash overrides #send' do -@@ -480,12 +485,23 @@ class PseudoHash < SimpleDelegator - { :number => 0 }, - { :number => 3 } - ) -- }.to fail_including(dedent(<<-END)) -- |Diff: -- |@@ #{one_line_header} @@ -- |-[{:number=>1}, {:number=>0}, {:number=>3}] -- |+[{:number=>1}, {:number=>2}, {:number=>3}] -- END -+ }.to fail_including( -+ if RUBY_VERSION.to_f > 3.3 -+ dedent(<<-END) -+ |Diff: -+ |@@ #{one_line_header} @@ -+ |-[{number: 1}, {number: 0}, {number: 3}] -+ |+[{number: 1}, {number: 2}, {number: 3}] -+ END -+ else -+ dedent(<<-END) -+ |Diff: -+ |@@ #{one_line_header} @@ -+ |-[{:number=>1}, {:number=>0}, {:number=>3}] -+ |+[{:number=>1}, {:number=>2}, {:number=>3}] -+ END -+ end -+ ) - end - end - -@@ -632,7 +648,7 @@ class PseudoHash < SimpleDelegator - it "fails if target includes expected key" do - expect { - expect({ :key => 'value' }).not_to include(:key) -- }.to fail_matching('expected {:key => "value"} not to include :key') -+ }.to fail_matching("expected #{hash_inspect({ :key => "value" })} not to include :key") - end - end - -@@ -751,13 +767,13 @@ class PseudoHash < SimpleDelegator - it "fails if target has a different value for key" do - expect { - expect({ :key => 'different' }).to include(:key => 'value') -- }.to fail_matching('expected {:key => "different"} to include {:key => "value"}') -+ }.to fail_matching("expected #{hash_inspect({ :key => "different" })} to include #{hash_inspect({ :key => "value" })}") - end - - it "fails if target has a different key" do - expect { - expect({ :other => 'value' }).to include(:key => 'value') -- }.to fail_matching('expected {:other => "value"} to include {:key => "value"}') -+ }.to fail_matching("expected #{hash_inspect({ :other => "value" })} to include #{hash_inspect({ :key => "value" })}") - end - end - -@@ -765,7 +781,7 @@ class PseudoHash < SimpleDelegator - it "fails if the target does not contain the given hash" do - expect { - expect(['a', 'b']).to include(:key => 'value') -- }.to fail_matching('expected ["a", "b"] to include {:key => "value"}') -+ }.to fail_matching("expected [\"a\", \"b\"] to include #{hash_inspect({ :key => "value" })}") - end - - it "passes if the target contains the given hash" do -@@ -779,13 +795,13 @@ class PseudoHash < SimpleDelegator - it "fails if target includes the key/value pair" do - expect { - expect({ :key => 'value' }).not_to include(:key => 'value') -- }.to fail_matching('expected {:key => "value"} not to include {:key => "value"}') -+ }.to fail_matching("expected #{hash_inspect({ :key => "value" })} not to include #{hash_inspect({ :key => "value" })}") - end - - it "fails if target includes the key/value pair among others" do - expect { - expect({ :key => 'value', :other => 'different' }).not_to include(:key => 'value') -- }.to fail_with(%r|expected #{hash_inspect :key => "value", :other => "different"} not to include \{:key => "value"\}|) -+ }.to fail_with(%r|expected #{hash_inspect(:key => "value", :other => "different")} not to include #{hash_inspect({ :key => "value" })}|) - end - - it "passes if target has a different value for key" do -@@ -805,7 +821,7 @@ class PseudoHash < SimpleDelegator - it "fails if the target contains the given hash" do - expect { - expect(['a', { :key => 'value' }]).not_to include(:key => 'value') -- }.to fail_matching('expected ["a", {:key => "value"}] not to include {:key => "value"}') -+ }.to fail_matching("expected [\"a\", #{hash_inspect({ :key => "value" })}] not to include #{hash_inspect({ :key => "value" })}") - end - end - end -@@ -982,13 +998,25 @@ def matches?(_) - - it 'provides a description' do - description = include(:a => a_value_within(3).of(10)).description -- expect(description).to eq("include {:a => (a value within 3 of 10)}") -+ expect(description).to eq( -+ if RUBY_VERSION.to_f > 3.3 -+ "include {a: (a value within 3 of 10)}" -+ else -+ "include {:a => (a value within 3 of 10)}" -+ end -+ ) - end - - it "fails with a clear message when the matcher does not match" do - expect { - expect(:a => 15).to include(:a => a_value_within(3).of(10)) -- }.to fail_matching("expected {:a => 15} to include {:a => (a value within 3 of 10)}") -+ }.to fail_matching( -+ if RUBY_VERSION.to_f > 3.3 -+ "expected {a: 15} to include {a: (a value within 3 of 10)}" -+ else -+ "expected {:a => 15} to include {:a => (a value within 3 of 10)}" -+ end -+ ) - end - end - -@@ -1005,7 +1033,7 @@ def matches?(_) - it 'fails with a clear message when the matcher does not match', :if => (RUBY_VERSION.to_f > 1.8) do - expect { - expect(:drink => "water", :food => "bread").to include(match(/bar/)) -- }.to fail_matching('expected {:drink => "water", :food => "bread"} to include (match /bar/)') -+ }.to fail_matching("expected #{hash_inspect({ :drink => "water", :food => "bread" })} to include (match /bar/)") - end - end - -@@ -1034,19 +1062,19 @@ def matches?(_) - it 'fails with a clear message when the value does not match', :if => (RUBY_VERSION.to_f > 1.8) do - expect { - expect(:drink => "water", :food => "bread").to include(match(/foo/) => "meat") -- }.to fail_matching('expected {:drink => "water", :food => "bread"} to include {(match /foo/) => "meat"}') -+ }.to fail_matching("expected #{hash_inspect({ :drink => "water", :food => "bread" })} to include {(match /foo/) => \"meat\"}") - end - - it 'fails with a clear message when the matcher does not match', :if => (RUBY_VERSION.to_f > 1.8) do - expect { - expect(:drink => "water", :food => "bread").to include(match(/bar/) => "bread") -- }.to fail_matching('expected {:drink => "water", :food => "bread"} to include {(match /bar/) => "bread"}') -+ }.to fail_matching("expected #{hash_inspect({ :drink => "water", :food => "bread" })} to include {(match /bar/) => \"bread\"}") - end - - it 'fails with a clear message when several matchers do not match', :if => (RUBY_VERSION.to_f > 1.8) do - expect { - expect(:drink => "water", :food => "bread").to include(match(/bar/) => "bread", match(/baz/) => "water") -- }.to fail_matching('expected {:drink => "water", :food => "bread"} to include {(match /bar/) => "bread", (match /baz/) => "water"}') -+ }.to fail_matching("expected #{hash_inspect({ :drink => "water", :food => "bread" })} to include {(match /bar/) => \"bread\", (match /baz/) => \"water\"}") - end - end - diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 0416196..0b62d56 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.3 +%global majorver 3.13.4 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 3 +%global baserelease 1 %global gem_name rspec-expectations @@ -23,9 +23,9 @@ Source0: https://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 -# https://github.com/rspec/rspec/pull/164 -# Support ruby34 Hash#inspect syntax -Patch0: rubygem-rspec-expectations-pr164-ruby34-hash-syntax.patch +# Workaround tests wrt diff/lcs diff format +# Partially revert 3.13.3 -> 3.13.4 change +Patch0: rubygem-rspec-expectations-3.13.4-diff_spec-format-revert.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -57,7 +57,8 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 -%patch -P0 -p2 + +%patch -P0 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec @@ -113,6 +114,9 @@ cucumber \ %{gem_docdir} %changelog +* Thu May 15 2025 Mamoru TASAKA - 3.13.4-1 +- 3.13.4 + * Sat Jan 18 2025 Fedora Release Engineering - 3.13.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 9f247d2..5902d8b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.13.3.gem) = 887d378bccf08f8f42dd3b580dc67dac0d91b7e08a23ab924bd8d618fae2f37132048b473a288a9f1c40096271e4312c28fc91383a074eda53d62939bb8c58fe -SHA512 (rubygem-rspec-expectations-3.13.3-full.tar.gz) = 0bd40f246fe44c76e489a7af44d5ccdad0ad346c6e8b1ec0c623d61f02e15fa70a3c014360a517b71be2b1a3adf261c079ebe0d198c5692a3c34fc8269495d9d +SHA512 (rspec-expectations-3.13.4.gem) = 6a4cc3f14cd953af1c391b00ac336c426659c63c943b419938e3c0d133d586e7b7ee17200c8c618ac83a334bedb9ea932fbaa4848880091d289fce8d8a8025d0 +SHA512 (rubygem-rspec-expectations-3.13.4-full.tar.gz) = ef23bf05fb220a860fe26c47fba8a0ff3c498c8d779fa2edb4e29a08e6fa0ebf85e62e17489ee9d6ae76d4df5cf0ecb634c70075887ba1cd2c7150994b1a7784 From c3034a91e23c05287e9347e0764166de4cc87f48 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 May 2025 17:32:44 +0900 Subject: [PATCH 30/33] 3.13.5 --- rspec-related-create-full-tarball.sh | 5 ++++- rubygem-rspec-expectations.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/rspec-related-create-full-tarball.sh b/rspec-related-create-full-tarball.sh index c0ba6bf..75e1fef 100644 --- a/rspec-related-create-full-tarball.sh +++ b/rspec-related-create-full-tarball.sh @@ -16,7 +16,10 @@ pushd $TMPDIRPATH git clone https://github.com/rspec/rspec.git pushd rspec -git reset --hard $1-v$2 + +# https://github.com/rspec/rspec/issues/220 +git reset --hard $1-v$2 || \ + git reset --hard rspec-expecations-v$2 ln -sf $1 $1-$2 tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./ diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 0b62d56..69c4694 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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} @@ -18,7 +18,7 @@ Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} # SPDX confirmed License: MIT -URL: http://github.com/rspec/rspec-expectations +URL: https://rspec.info Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz @@ -114,6 +114,9 @@ cucumber \ %{gem_docdir} %changelog +* Thu May 29 2025 Mamoru TASAKA - 3.13.5-1 +- 3.13.5 + * Thu May 15 2025 Mamoru TASAKA - 3.13.4-1 - 3.13.4 diff --git a/sources b/sources index 5902d8b..4d0ea5c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-expectations-3.13.4.gem) = 6a4cc3f14cd953af1c391b00ac336c426659c63c943b419938e3c0d133d586e7b7ee17200c8c618ac83a334bedb9ea932fbaa4848880091d289fce8d8a8025d0 -SHA512 (rubygem-rspec-expectations-3.13.4-full.tar.gz) = ef23bf05fb220a860fe26c47fba8a0ff3c498c8d779fa2edb4e29a08e6fa0ebf85e62e17489ee9d6ae76d4df5cf0ecb634c70075887ba1cd2c7150994b1a7784 +SHA512 (rspec-expectations-3.13.5.gem) = 4fde5ddae1c723bb3f25c65db61ec959146b1b92a08ddf09d4caf1164d25fd67e4d6d7a73b576fdb48477a3ee54763a8a2d3b93ea573ba6962d65ae80379cd03 +SHA512 (rubygem-rspec-expectations-3.13.5-full.tar.gz) = 057bf2ff409248ab4a37bc615806e786cdcf4324bd47bb606459a6ceece07799dc488838d008511bb7d798db6b8dddf2339cb6509c2d78911aa9aa06f50607ea From 87a8d5773d6e7f66e68b998c8ca209df00d4498d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:45:32 +0000 Subject: [PATCH 31/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-rspec-expectations.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 69c4694..1ef36a7 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -114,6 +114,9 @@ cucumber \ %{gem_docdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.13.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 29 2025 Mamoru TASAKA - 3.13.5-1 - 3.13.5 From 6ac0794a0c893fe7d77b6efc192962011887ef09 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Dec 2025 16:41:45 +0900 Subject: [PATCH 32/33] Backport upstream patch to support ruby4_0 source_location behavior change --- ...ations-pr282-ruby4_0-source_location.patch | 25 +++++++++++++++++++ rubygem-rspec-expectations.spec | 9 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 rspec-expectations-pr282-ruby4_0-source_location.patch diff --git a/rspec-expectations-pr282-ruby4_0-source_location.patch b/rspec-expectations-pr282-ruby4_0-source_location.patch new file mode 100644 index 0000000..19483fc --- /dev/null +++ b/rspec-expectations-pr282-ruby4_0-source_location.patch @@ -0,0 +1,25 @@ +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-expectations/lib/rspec/expectations/block_snippet_extractor.rb b/rspec-expectations/lib/rspec/expectations/block_snippet_extractor.rb +index 5c66ac639..24dbaf88e 100644 +--- a/rspec-expectations/lib/rspec/expectations/block_snippet_extractor.rb ++++ b/rspec-expectations/lib/rspec/expectations/block_snippet_extractor.rb +@@ -62,7 +62,7 @@ def file_path + end + + def beginning_line_number +- source_location.last ++ source_location[1] + end + + def source_location diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index 1ef36a7..c7d29c2 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -26,6 +26,9 @@ Source2: rspec-related-create-full-tarball.sh # Workaround tests wrt diff/lcs diff format # Partially revert 3.13.3 -> 3.13.4 change Patch0: rubygem-rspec-expectations-3.13.4-diff_spec-format-revert.patch +# https://github.com/rspec/rspec/pull/282/commits/1c20fa80772ca7a1ed0512056ce7cd6a94f8e68d +# Support ruby4_0 source_location behavior change +Patch1: rspec-expectations-pr282-ruby4_0-source_location.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -59,6 +62,7 @@ This package contains documentation for %{name}. %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 +%patch -P1 -p2 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec @@ -114,6 +118,9 @@ cucumber \ %{gem_docdir} %changelog +* Tue Dec 02 2025 Mamoru TASAKA - 3.13.5-3 +- Backport upstream patch to support ruby4_0 source_location behavior change + * Fri Jul 25 2025 Fedora Release Engineering - 3.13.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From bf30e4437e66addd1140d43362c48d3188b0d20c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Jan 2026 21:10:50 +0900 Subject: [PATCH 33/33] Fix compatibility for minitest 6 --- rubygem-rspec-expectations.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index c7d29c2..63bcd3c 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.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-expectations @@ -93,6 +93,13 @@ rspec spec/ exit 0 %endif +# Fix minitest 6 compatibility +# Behavior changed on: https://github.com/minitest/minitest/commit/2572c78420af73dbe9b202d535a1474405a32173 +if ( ruby -e 'require "minitest" ; exit Minitest::VERSION >= "6"' ) ; then + sed -i features/test_frameworks/minitest.feature \ + -e 's|9 runs, 10 assertions, 5 failures, 0 errors|9 runs, 11 assertions, 5 failures, 0 errors|' +fi + # Skip one failing scenario, needs investigating... sed -i features/built_in_matchers/include.feature -e '\@skip-on-fedora@d' sed -i features/built_in_matchers/include.feature -e 's|^\([ \t]*\)\(Scenario: counts usage.*\)|\1@skip-on-fedora\n\1\2|' @@ -118,6 +125,9 @@ cucumber \ %{gem_docdir} %changelog +* Thu Jan 01 2026 Mamoru TASAKA - 3.13.5-4 +- Fix compatibility for minitest 6 + * Tue Dec 02 2025 Mamoru TASAKA - 3.13.5-3 - Backport upstream patch to support ruby4_0 source_location behavior change