Compare commits

..

No commits in common. "rawhide" and "f35" have entirely different histories.

6 changed files with 57 additions and 145 deletions

42
.gitignore vendored
View file

@ -1,2 +1,40 @@
/rspec-support-*gem
/rubygem-rspec-support-*-full.tar.gz
/rspec-support-3.0.0.beta2.gem
/rspec-support-3.0.3.gem
/rspec-support-3.1.2.gem
/rubygem-rspec-support-3.1.2-full.tar.gz
/rspec-support-3.2.1.gem
/rubygem-rspec-support-3.2.1-full.tar.gz
/rspec-support-3.2.2.gem
/rubygem-rspec-support-3.2.2-full.tar.gz
/rspec-support-3.3.0.gem
/rubygem-rspec-support-3.3.0-full.tar.gz
/rspec-support-3.4.1.gem
/rubygem-rspec-support-3.4.1-full.tar.gz
/rspec-support-3.5.0.gem
/rubygem-rspec-support-3.5.0-full.tar.gz
/rspec-support-3.6.0.gem
/rubygem-rspec-support-3.6.0-full.tar.gz
/rspec-support-3.7.0.gem
/rubygem-rspec-support-3.7.0-full.tar.gz
/rspec-support-3.7.1.gem
/rubygem-rspec-support-3.7.1-full.tar.gz
/rspec-support-3.8.0.gem
/rubygem-rspec-support-3.8.0-full.tar.gz
/rspec-support-3.8.2.gem
/rubygem-rspec-support-3.8.2-full.tar.gz
/rspec-support-3.9.0.gem
/rubygem-rspec-support-3.9.0-full.tar.gz
/rspec-support-3.9.1.gem
/rubygem-rspec-support-3.9.1-full.tar.gz
/rspec-support-3.9.2.gem
/rubygem-rspec-support-3.9.2-full.tar.gz
/rspec-support-3.9.3.gem
/rubygem-rspec-support-3.9.3-full.tar.gz
/rspec-support-3.10.0.gem
/rubygem-rspec-support-3.10.0-full.tar.gz
/rspec-support-3.10.1.gem
/rubygem-rspec-support-3.10.1-full.tar.gz
/rspec-support-3.10.2.gem
/rubygem-rspec-support-3.10.2-full.tar.gz
/rspec-support-3.10.3.gem
/rubygem-rspec-support-3.10.3-full.tar.gz

View file

@ -14,9 +14,10 @@ CURRDIR=$(pwd)
TMPDIRPATH=$(mktemp -d /var/tmp/rspec-tar-XXXXXX)
pushd $TMPDIRPATH
git clone https://github.com/rspec/rspec.git
pushd rspec
git reset --hard $1-v$2
git clone https://github.com/rspec/$1.git
pushd $1
git reset --hard v$2
popd
ln -sf $1 $1-$2
tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./

View file

@ -1,28 +0,0 @@
From 02e44fa481d5061c95d5332a91bcf7143b582bc8 Mon Sep 17 00:00:00 2001
From: Jon Rowe <hello@jonrowe.co.uk>
Date: Sat, 10 Dec 2022 11:25:15 +1100
Subject: [PATCH] Pend broken spec on Ruby 3.1.3, skip on CI for Ruby head
---
spec/rspec/support/reentrant_mutex_spec.rb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/spec/rspec/support/reentrant_mutex_spec.rb b/spec/rspec/support/reentrant_mutex_spec.rb
index 9bef54ee..c8a41c1e 100644
--- a/spec/rspec/support/reentrant_mutex_spec.rb
+++ b/spec/rspec/support/reentrant_mutex_spec.rb
@@ -28,7 +28,13 @@
order.join_all
end
- if RUBY_VERSION >= '3.0'
+ # On Ruby 3.1.3 and RUBY_HEAD the raise in this spec can
+ # bypass the `raise_error` capture and break this spec but
+ # it is not sufficient to pend it as the raise can escape to the other
+ # threads somehow therefore poisoning them so its skipped entirely.
+ # This is a temporary work around to allow green cross project builds but
+ # needs a fix.
+ if RUBY_VERSION >= '3.0' && RUBY_VERSION < '3.1.3'
it 'waits when trying to lock from another Fiber' do
mutex.synchronize do
ready = false

View file

@ -1,20 +0,0 @@
--- rspec-support-3.13.3/spec/rspec/support/differ_spec.rb.orig 2025-05-15 11:05:59.000000000 +0900
+++ rspec-support-3.13.3/spec/rspec/support/differ_spec.rb 2025-05-15 11:36:03.054513436 +0900
@@ -200,7 +200,7 @@ module RSpec
expected_diff = dedent(<<-"EOD")
|
- |@@ #{one_line_header(5)} @@
+ |@@ -1,5 +1,5 @@
| <Animal
| name=bob,
|- species=tortoise
@@ -427,7 +427,7 @@ module RSpec
expected_diff = dedent(<<-"EOD")
|
- |@@ #{one_line_header(3)} @@
+ |@@ -1,3 +1,3 @@
| this is:
|- another string
|+ one string

View file

@ -1,41 +1,35 @@
%global gem_name rspec-support
%global mainver 3.13.6
%global mainver 3.10.3
%undefine prever
%global baserelease 1
%global mainrel 1
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%bcond_with bootstrap
%global need_bootstrap_set 0
%undefine __brp_mangle_shebangs
Name: rubygem-%{gem_name}
Version: %{mainver}
Release: %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}%{?dist}
Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}
Summary: Common functionality to Rspec series
# SPDX confirmed
License: MIT
URL: https://rspec.info
URL: https://github.com/rspec/rspec-support
Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem
# %%{SOURCE2} %%{name} %%{version}
Source1: rubygem-%{gem_name}-%{version}-full.tar.gz
Source2: rspec-related-create-full-tarball.sh
# Workaround tests wrt diff/lcs diff format
# Partially revert 3.13.2 -> 3.13.3 change
Patch0: rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch
# tweak regex for search path
Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch
#BuildRequires: ruby(release)
BuildRequires: rubygems-devel
%if %{without bootstrap}
%if 0%{?need_bootstrap_set} < 1
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(thread_order)
BuildRequires: rubygem(bigdecimal)
# spec/rspec/support/spec/shell_out_spec.rb -> lib/rspec/support/spec/library_wide_checks.rb
# -> rake (%%check)
BuildRequires: rubygem(rake)
BuildRequires: git
%endif
@ -61,8 +55,7 @@ Documentation for %{name}
%setup -q -T -n %{gem_name}-%{version} -b 1
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%patch -P0 -p1
%patch -P100 -p1
%patch100 -p1
%build
gem build %{gem_name}.gemspec
@ -73,8 +66,8 @@ mkdir -p %{buildroot}%{gem_dir}
cp -pa .%{gem_dir}/* \
%{buildroot}%{gem_dir}/
%if 0%{?need_bootstrap_set} < 1
%check
%if %{without bootstrap}
# UTF-8 is needed
LANG=C.UTF-8
@ -92,8 +85,8 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) {
${FAILFILE[$i]}
}
export RUBYLIB=$(pwd)/lib
rspec spec/ || rspec --tag ~broken
ruby -rrubygems -Ilib/ -S rspec spec/ || \
ruby -rrubygems -Ilib/ -S rspec --tag ~broken
%endif
%files
@ -110,78 +103,6 @@ rspec spec/ || rspec --tag ~broken
%doc %{gem_docdir}
%changelog
* Wed Sep 17 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.6-1
- 3.13.6
* Tue Aug 19 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.5-1
- 3.13.5
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu May 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.4-1
- 3.13.4
* Thu May 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.3-1
- 3.13.3
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sun Dec 29 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.2-2
- Backport upstream fix to support ruby34 Hash inspect syntax
* Thu Dec 05 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.2-1
- 3.13.2
* Wed Nov 06 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.1-3
- Backport upstream fix for ruby34
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun Feb 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.1-1
- 3.13.1
* Fri Feb 09 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.0-1
- 3.13.0
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jul 1 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.1-1
- 3.12.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
* Sun Dec 11 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.0-3
- Backport upstrem patch for pending broken test with ruby >= 3.1.3
* Fri Dec 2 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.0-2
- Pull upstream patch (under review) for ruby filer deadlock treatment
* Thu Oct 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.0-1
- 3.12.0
* Thu Sep 15 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.1-1
- 3.11.1
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Feb 10 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.0-1
- 3.11.0
* Sat Jan 29 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.3-2
- BR: rubygem(rake) for %%check
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Nov 4 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.3-1
- 3.10.3

View file

@ -1,2 +1,2 @@
SHA512 (rubygem-rspec-support-3.13.6-full.tar.gz) = 09387dd39649d47bc3b859251e428808e06b1d2e6bc13d38f2b2da9241e1c937c71992f4b042053729d64af535fd6a6931d73b6d4f454c35eceae037839fa77d
SHA512 (rspec-support-3.13.6.gem) = 7a07e6233e59da5bf9b1347de3e56330b02906cec8d05d619b1ff5f802f98cdf1194e63c01f4a3f5ac0bc68b59794edeaf4dc91cab37b563d57be82543e7df12
SHA512 (rspec-support-3.10.3.gem) = edeaf7d77472446fd126b851621ae7a54923e56d64c8ca34a99a9b87c53f8548a06edad86f04c7719a3cd781d9fdd9b7d2c519c084c9579df8c549b191d1c16d
SHA512 (rubygem-rspec-support-3.10.3-full.tar.gz) = becabc46f5c25e7dbedb549882f1b9d3ff74805ca581b15f4bb782862500dfbce9f1a699dffeeaf0f0aa4dc702dc3200abf6de743a5cf9f7fc09c1b3ca7bacc0