From 0dcd1fe18363842148bdeb8af78c62f5c97da2a7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Dec 2015 16:22:00 +0900 Subject: [PATCH 01/72] 3.4.1 - Once disable tests --- .gitignore | 2 ++ rubygem-rspec-support.spec | 30 ++++++++++++++++++++++++------ sources | 4 ++-- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 1080934..c6b9fd5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 2dba11b..c9c8143 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,12 +1,12 @@ %global gem_name rspec-support -%global mainver 3.3.0 +%global mainver 3.4.1 %undefine prever -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 Name: rubygem-%{gem_name} Version: %{mainver} @@ -23,10 +23,11 @@ Source2: rspec-related-create-full-tarball.sh # tweak regex for search path Patch0: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch -BuildRequires: ruby(release) +#BuildRequires: ruby(release) BuildRequires: rubygems-devel %if 0%{?need_bootstrap_set} < 1 BuildRequires: rubygem(rspec) +BuildRequires: rubygem(thread_order) BuildRequires: git %endif @@ -75,16 +76,29 @@ cp -pa .%{gem_dir}/* \ LANG=en_US.UTF-8 pushd %{gem_name}-%{version} -ruby -rubygems -Ilib/ -S rspec spec/ +# Test failure needs investigation... +FAILFILE=() +FAILTEST=() +FAILFILE+=("spec/rspec/support/differ_spec.rb") +FAILTEST+=("copes with encoded strings") + +for ((i = 0; i < ${#FAILFILE[@]}; i++)) { + sed -i \ + -e "\@${FAILTEST[$i]}@s|do$|, :broken => true do|" \ + ${FAILFILE[$i]} +} + +ruby -rubygems -Ilib/ -S rspec spec/ || \ + ruby -rubygems -Ilib/ -S rspec --tag ~broken popd %endif %files %dir %{gem_instdir} +%license %{gem_instdir}/LICENSE.md %doc %{gem_instdir}/Changelog.md %doc %{gem_instdir}/README.md -%license %{gem_instdir}/LICENSE.txt %{gem_libdir} %exclude %{gem_cache} @@ -94,6 +108,10 @@ popd %doc %{gem_docdir} %changelog +* Tue Dec 8 2015 Mamoru TASAKA - 3.4.1-1 +- 3.4.1 +- Once disable tests + * Sun Aug 2 2015 Mamoru TASAKA - 3.3.0-2 - Enable tests again diff --git a/sources b/sources index aef0b90..98ed596 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c6ea2843efcf13bea90f0c044a609499 rspec-support-3.3.0.gem -cda99451bf0300ddfd0edcca3765c577 rubygem-rspec-support-3.3.0-full.tar.gz +5abd58ba3a7a6204c0d2afa84078fe1d rspec-support-3.4.1.gem +f8809bb0322aae51573e12f711274ab4 rubygem-rspec-support-3.4.1-full.tar.gz From ccc67e28bf80b7fb6f91c8174b33feb6e2581a89 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Dec 2015 17:24:26 +0900 Subject: [PATCH 02/72] Enable tests again --- rubygem-rspec-support.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index c9c8143..ca5b8d5 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,10 +3,10 @@ %global mainver 3.4.1 %undefine prever -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 Name: rubygem-%{gem_name} Version: %{mainver} @@ -108,6 +108,9 @@ popd %doc %{gem_docdir} %changelog +* Tue Dec 8 2015 Mamoru TASAKA - 3.4.1-2 +- Enable tests again + * Tue Dec 8 2015 Mamoru TASAKA - 3.4.1-1 - 3.4.1 - Once disable tests From 05730a2a173755f472ce7ceec6a8ea0fc222b929 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:14:47 +0000 Subject: [PATCH 03/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index ca5b8d5..c7bec08 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -10,7 +10,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series Group: Development/Languages @@ -108,6 +108,9 @@ popd %doc %{gem_docdir} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 3.4.1-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Dec 8 2015 Mamoru TASAKA - 3.4.1-2 - Enable tests again From b50f326c7fb1a43a0264b8abf8d3e8f8e3ef2bf4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Jul 2016 00:47:46 +0900 Subject: [PATCH 04/72] 3.5.0 - Once disable tests --- .gitignore | 2 ++ rubygem-rspec-support.spec | 14 ++++++++++---- sources | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c6b9fd5..1d7bf7e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index c7bec08..8ad677d 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,16 +1,16 @@ %global gem_name rspec-support -%global mainver 3.4.1 +%global mainver 3.5.0 %undefine prever -%global mainrel 2 +%global mainrel 0.1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series Group: Development/Languages @@ -79,8 +79,10 @@ pushd %{gem_name}-%{version} # Test failure needs investigation... FAILFILE=() FAILTEST=() +%if 0 FAILFILE+=("spec/rspec/support/differ_spec.rb") FAILTEST+=("copes with encoded strings") +%endif for ((i = 0; i < ${#FAILFILE[@]}; i++)) { sed -i \ @@ -108,6 +110,10 @@ popd %doc %{gem_docdir} %changelog +* Sat Jul 23 2016 Mamoru TASAKA - 3.5.0-0.1 +- 3.5.0 +- Once disable tests + * Thu Feb 04 2016 Fedora Release Engineering - 3.4.1-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 98ed596..45e2b8b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5abd58ba3a7a6204c0d2afa84078fe1d rspec-support-3.4.1.gem -f8809bb0322aae51573e12f711274ab4 rubygem-rspec-support-3.4.1-full.tar.gz +d3b1e5c0d8fd9ec7cdc5d443385e7c0a rspec-support-3.5.0.gem +7cc7826a8cc539ca0a124b394a771de8 rubygem-rspec-support-3.5.0-full.tar.gz From 73552e91af5690340edbdac0e53f51ce6c9a9206 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Jul 2016 01:12:29 +0900 Subject: [PATCH 05/72] Enable tests again --- rubygem-rspec-support.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 8ad677d..b02fe9c 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,10 +3,10 @@ %global mainver 3.5.0 %undefine prever -%global mainrel 0.1 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 Name: rubygem-%{gem_name} Version: %{mainver} @@ -110,6 +110,9 @@ popd %doc %{gem_docdir} %changelog +* Sun Jul 24 2016 Mamoru TASAKA - 3.5.0-1 +- Enable tests again + * Sat Jul 23 2016 Mamoru TASAKA - 3.5.0-0.1 - 3.5.0 - Once disable tests From 42b63df6cf7472dcdb5cff1fd4f2b5ce9322885a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Jul 2016 01:21:21 +0900 Subject: [PATCH 06/72] Enable tests again --- rubygem-rspec-support.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index b02fe9c..18eb14d 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -28,6 +28,7 @@ BuildRequires: rubygems-devel %if 0%{?need_bootstrap_set} < 1 BuildRequires: rubygem(rspec) BuildRequires: rubygem(thread_order) +BuildRequires: rubygem(bigdecimal) BuildRequires: git %endif From 9b467561e2d49bd3e9805c77e6facef57a682178 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 3 Feb 2017 16:59:32 +0100 Subject: [PATCH 07/72] Fix for Ruby 2.4.0 compatibility. --- ...3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch | 73 +++++++++++++++++++ ...pport-3.6.0.beta2-fix-for-ruby-2.4.0.patch | 18 +++++ rubygem-rspec-support.spec | 14 +++- 3 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch create mode 100644 rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0.patch diff --git a/rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch b/rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch new file mode 100644 index 0000000..1498f18 --- /dev/null +++ b/rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch @@ -0,0 +1,73 @@ +diff --git a/spec/rspec/support/fuzzy_matcher_spec.rb b/spec/rspec/support/fuzzy_matcher_spec.rb +index fc92ec5..2c0abec 100644 +--- a/spec/rspec/support/fuzzy_matcher_spec.rb ++++ b/spec/rspec/support/fuzzy_matcher_spec.rb +@@ -120,17 +120,17 @@ module RSpec + end + + it 'does the fuzzy matching on the individual elements' do +- expect([String, Fixnum]).to match_against(["a", 2]) +- expect([String, Fixnum]).not_to match_against([2, "a"]) ++ expect([String, Integer]).to match_against(["a", 2]) ++ expect([String, Integer]).not_to match_against([2, "a"]) + end + + it 'returns false if they have a different number of elements' do +- expect([String, Fixnum]).not_to match_against(['a', 2, nil]) ++ expect([String, Integer]).not_to match_against(['a', 2, nil]) + end + + it 'supports arbitrary nested arrays' do + a1 = [ +- [String, Fixnum, [be_within(0.1).of(2)]], ++ [String, Integer, [be_within(0.1).of(2)]], + 3, [[[ /foo/ ]]] + ] + +@@ -154,8 +154,8 @@ module RSpec + end + end.new + +- expect([Fixnum, String]).to match_against(my_enum) +- expect([String, Fixnum]).not_to match_against(my_enum) ++ expect([Integer, String]).to match_against(my_enum) ++ expect([String, Integer]).not_to match_against(my_enum) + end + + it 'does not match an empty hash against an empty array or vice-versa' do +@@ -192,7 +192,7 @@ module RSpec + it 'supports arbitrary nested hashes' do + h1 = { + :a => { +- :b => [String, Fixnum], ++ :b => [String, Integer], + :c => { :d => be_within(0.1).of(2) } + } + } +diff --git a/spec/rspec/support/object_formatter_spec.rb b/spec/rspec/support/object_formatter_spec.rb +index 7e16fb5..6eed58c 100644 +--- a/spec/rspec/support/object_formatter_spec.rb ++++ b/spec/rspec/support/object_formatter_spec.rb +@@ -82,10 +82,19 @@ module RSpec + + let(:formatted_decimal) { ObjectFormatter.format(decimal) } + +- it 'fails with a conventional representation of the decimal' do +- in_sub_process_if_possible do +- require 'bigdecimal' +- expect(formatted_decimal).to include('3.3 (#= '2.4' ++ it "uses Ruby's BigDecimal formatting since it is improved in 2.4+" do ++ in_sub_process_if_possible do ++ require 'bigdecimal' ++ expect(formatted_decimal).to eq('0.33e1') ++ end ++ end ++ else ++ it 'includes a conventional representation of the decimal' do ++ in_sub_process_if_possible do ++ require 'bigdecimal' ++ expect(formatted_decimal).to include('3.3 (#= '2.4' ++ end + end + end + end diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 18eb14d..2452f1e 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.5.0 %undefine prever -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 0 @@ -22,6 +22,10 @@ Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh # tweak regex for search path Patch0: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch +# Fix for Ruby 2.4.0 compatiblity. +# https://github.com/rspec/rspec-support/commit/725fc24 +Patch1: rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0.patch +Patch2: rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -33,8 +37,6 @@ BuildRequires: git %endif BuildArch: noarch -# Need fix -Provides: rubygem(%{gem_name}) = %{version}-%{release} %description `RSpec::Support` provides common functionality to `RSpec::Core`, @@ -61,6 +63,7 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec ( cd %{gem_name}-%{version} %patch0 -p1 +%patch1 -p1 ) %build @@ -77,6 +80,8 @@ cp -pa .%{gem_dir}/* \ LANG=en_US.UTF-8 pushd %{gem_name}-%{version} +cat %{PATCH2} | patch -p1 + # Test failure needs investigation... FAILFILE=() FAILTEST=() @@ -111,6 +116,9 @@ popd %doc %{gem_docdir} %changelog +* Fri Feb 03 2017 Jun Aruga - 3.5.0-2 +- Fix for Ruby 2.4.0 compatibility. + * Sun Jul 24 2016 Mamoru TASAKA - 3.5.0-1 - Enable tests again From d54e4ceab8ffa054fac1de0efbdb0328106ca626 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Feb 2017 16:38:10 +0900 Subject: [PATCH 08/72] Always use full tar.gz for installed files and keep using gem file for gem spec (ref: bug 1425220) --- rubygem-rspec-support.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 2452f1e..004bd71 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.5.0 %undefine prever -%global mainrel 2 +%global mainrel 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 0 @@ -56,15 +56,12 @@ Documentation for %{name} %global version %{version_orig}%{?prever} %prep -gem unpack %{SOURCE0} -%setup -q -D -T -n %{gem_name}-%{version} -a 1 +%setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -( -cd %{gem_name}-%{version} %patch0 -p1 %patch1 -p1 -) +%patch2 -p1 %build gem build %{gem_name}.gemspec @@ -78,9 +75,6 @@ cp -pa .%{gem_dir}/* \ %if 0%{?need_bootstrap_set} < 1 %check LANG=en_US.UTF-8 -pushd %{gem_name}-%{version} - -cat %{PATCH2} | patch -p1 # Test failure needs investigation... FAILFILE=() @@ -98,8 +92,6 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { ruby -rubygems -Ilib/ -S rspec spec/ || \ ruby -rubygems -Ilib/ -S rspec --tag ~broken - -popd %endif %files @@ -116,6 +108,10 @@ popd %doc %{gem_docdir} %changelog +* Tue Feb 21 2017 Mamoru TASAKA - 3.5.0-3 +- Always use full tar.gz for installed files and + keep using gem file for gem spec (ref: bug 1425220) + * Fri Feb 03 2017 Jun Aruga - 3.5.0-2 - Fix for Ruby 2.4.0 compatibility. From 95b471521abc9b8738571e34f5b7a5b395d5cd88 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 22:15:52 +0900 Subject: [PATCH 09/72] 3.6.0 Once disable tests --- .gitignore | 1 + rubygem-rspec-support.spec | 16 +++++++--------- sources | 3 +-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 1d7bf7e..17fc3b9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 004bd71..dc257a5 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,12 +1,12 @@ %global gem_name rspec-support -%global mainver 3.5.0 +%global mainver 3.6.0 %undefine prever -%global mainrel 3 +%global mainrel 0.1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 Name: rubygem-%{gem_name} Version: %{mainver} @@ -22,10 +22,6 @@ Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh # tweak regex for search path Patch0: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch -# Fix for Ruby 2.4.0 compatiblity. -# https://github.com/rspec/rspec-support/commit/725fc24 -Patch1: rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0.patch -Patch2: rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -60,8 +56,6 @@ Documentation for %{name} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build gem build %{gem_name}.gemspec @@ -108,6 +102,10 @@ ruby -rubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Sat May 6 2017 Mamoru TASAKA - 3.6.0-0.1 +- 3.6.0 +- Once disable tests + * Tue Feb 21 2017 Mamoru TASAKA - 3.5.0-3 - Always use full tar.gz for installed files and keep using gem file for gem spec (ref: bug 1425220) diff --git a/sources b/sources index 45e2b8b..00efb98 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d3b1e5c0d8fd9ec7cdc5d443385e7c0a rspec-support-3.5.0.gem -7cc7826a8cc539ca0a124b394a771de8 rubygem-rspec-support-3.5.0-full.tar.gz +SHA512 (rspec-support-3.6.0.gem) = 49ae5720093bb3d3323a7f313cbce9ac177ef21c3bb71a5a68f1152783252c10dbbf6ea10f51a08aa8073846b1819e7bce9a0711137cb255f7f29c996bd19b20 From e056b268aadf2f0f08ac2f8a3a682b89914a25bb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 22:19:29 +0900 Subject: [PATCH 10/72] remove patch --- ...3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch | 73 ------------------- ...pport-3.6.0.beta2-fix-for-ruby-2.4.0.patch | 18 ----- 2 files changed, 91 deletions(-) delete mode 100644 rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch delete mode 100644 rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0.patch diff --git a/rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch b/rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch deleted file mode 100644 index 1498f18..0000000 --- a/rubygem-rspec-support-3.6.0.beta2-fix-for-ruby-2.4.0-tests.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/spec/rspec/support/fuzzy_matcher_spec.rb b/spec/rspec/support/fuzzy_matcher_spec.rb -index fc92ec5..2c0abec 100644 ---- a/spec/rspec/support/fuzzy_matcher_spec.rb -+++ b/spec/rspec/support/fuzzy_matcher_spec.rb -@@ -120,17 +120,17 @@ module RSpec - end - - it 'does the fuzzy matching on the individual elements' do -- expect([String, Fixnum]).to match_against(["a", 2]) -- expect([String, Fixnum]).not_to match_against([2, "a"]) -+ expect([String, Integer]).to match_against(["a", 2]) -+ expect([String, Integer]).not_to match_against([2, "a"]) - end - - it 'returns false if they have a different number of elements' do -- expect([String, Fixnum]).not_to match_against(['a', 2, nil]) -+ expect([String, Integer]).not_to match_against(['a', 2, nil]) - end - - it 'supports arbitrary nested arrays' do - a1 = [ -- [String, Fixnum, [be_within(0.1).of(2)]], -+ [String, Integer, [be_within(0.1).of(2)]], - 3, [[[ /foo/ ]]] - ] - -@@ -154,8 +154,8 @@ module RSpec - end - end.new - -- expect([Fixnum, String]).to match_against(my_enum) -- expect([String, Fixnum]).not_to match_against(my_enum) -+ expect([Integer, String]).to match_against(my_enum) -+ expect([String, Integer]).not_to match_against(my_enum) - end - - it 'does not match an empty hash against an empty array or vice-versa' do -@@ -192,7 +192,7 @@ module RSpec - it 'supports arbitrary nested hashes' do - h1 = { - :a => { -- :b => [String, Fixnum], -+ :b => [String, Integer], - :c => { :d => be_within(0.1).of(2) } - } - } -diff --git a/spec/rspec/support/object_formatter_spec.rb b/spec/rspec/support/object_formatter_spec.rb -index 7e16fb5..6eed58c 100644 ---- a/spec/rspec/support/object_formatter_spec.rb -+++ b/spec/rspec/support/object_formatter_spec.rb -@@ -82,10 +82,19 @@ module RSpec - - let(:formatted_decimal) { ObjectFormatter.format(decimal) } - -- it 'fails with a conventional representation of the decimal' do -- in_sub_process_if_possible do -- require 'bigdecimal' -- expect(formatted_decimal).to include('3.3 (#= '2.4' -+ it "uses Ruby's BigDecimal formatting since it is improved in 2.4+" do -+ in_sub_process_if_possible do -+ require 'bigdecimal' -+ expect(formatted_decimal).to eq('0.33e1') -+ end -+ end -+ else -+ it 'includes a conventional representation of the decimal' do -+ in_sub_process_if_possible do -+ require 'bigdecimal' -+ expect(formatted_decimal).to include('3.3 (#= '2.4' -+ end - end - end - end From 58bde682b8ead48aa7e4a861a9498b88ea3da2e8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 22:26:48 +0900 Subject: [PATCH 11/72] add full source --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 17fc3b9..45ce0e2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /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 diff --git a/sources b/sources index 00efb98..42c6ddb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (rspec-support-3.6.0.gem) = 49ae5720093bb3d3323a7f313cbce9ac177ef21c3bb71a5a68f1152783252c10dbbf6ea10f51a08aa8073846b1819e7bce9a0711137cb255f7f29c996bd19b20 +SHA512 (rubygem-rspec-support-3.6.0-full.tar.gz) = 97832f9ab4c6ec9d63811182cdc809ba282f4c669eed95affb8568ac66f0f749d39f1727f0359da84f28efb3bad4879c9b48248c62763d55c4472d3136c6a7fb From 1c62485c6c55fb9317132cabc0627a17ced69292 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 23:41:29 +0900 Subject: [PATCH 12/72] Enable tests again --- rubygem-rspec-support.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index dc257a5..70dd09e 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,10 +3,10 @@ %global mainver 3.6.0 %undefine prever -%global mainrel 0.1 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 Name: rubygem-%{gem_name} Version: %{mainver} @@ -102,6 +102,9 @@ ruby -rubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Sat May 6 2017 Mamoru TASAKA - 3.6.0-1 +- Enable tests again + * Sat May 6 2017 Mamoru TASAKA - 3.6.0-0.1 - 3.6.0 - Once disable tests From 6defb6fbb853c36bbc0d0891b201d33429585904 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 17:45:17 +0000 Subject: [PATCH 13/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 70dd09e..e5fd947 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -10,7 +10,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series Group: Development/Languages @@ -102,6 +102,9 @@ ruby -rubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.6.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat May 6 2017 Mamoru TASAKA - 3.6.0-1 - Enable tests again From ea5246137bbaf283750c9ae6cdfb5db3a1a1bd01 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Nov 2017 15:49:19 +0900 Subject: [PATCH 14/72] 3.7.0 Once disable tests --- .gitignore | 2 ++ rubygem-rspec-support.spec | 12 ++++++++---- sources | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 45ce0e2..26f35c3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index e5fd947..9d82759 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,16 +1,16 @@ %global gem_name rspec-support -%global mainver 3.6.0 +%global mainver 3.7.0 %undefine prever -%global mainrel 1 +%global mainrel 0.1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series Group: Development/Languages @@ -102,6 +102,10 @@ ruby -rubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Mon Nov 13 2017 Mamoru TASAKA - 3.7.0-0.1 +- 3.7.0 +- Once disable tests + * Thu Jul 27 2017 Fedora Release Engineering - 3.6.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 42c6ddb..6c3b243 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.6.0.gem) = 49ae5720093bb3d3323a7f313cbce9ac177ef21c3bb71a5a68f1152783252c10dbbf6ea10f51a08aa8073846b1819e7bce9a0711137cb255f7f29c996bd19b20 -SHA512 (rubygem-rspec-support-3.6.0-full.tar.gz) = 97832f9ab4c6ec9d63811182cdc809ba282f4c669eed95affb8568ac66f0f749d39f1727f0359da84f28efb3bad4879c9b48248c62763d55c4472d3136c6a7fb +SHA512 (rspec-support-3.7.0.gem) = 50b23dc2da21c638b552b55651d551759b139b6a16f3cbdd38d9ced41fbdbab808cc034800d3e98126cfadf2a03db479493811478cb7a4b751a98f252b57867d +SHA512 (rubygem-rspec-support-3.7.0-full.tar.gz) = e6b82652df9d7e2f5b7f43f83c32c77e85d6e1d44db87538ab7b2dfd04c714930318e21ea42cbf85fd03b1ac595c78a1019fc78f3d61884a01e9c4257ec7dd12 From 7a5ed7821b4eec75e5f349a904bc568148dab4ce Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Nov 2017 15:59:25 +0900 Subject: [PATCH 15/72] Enable tests again --- rubygem-rspec-support.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 9d82759..23b3d6d 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,10 +3,10 @@ %global mainver 3.7.0 %undefine prever -%global mainrel 0.1 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 Name: rubygem-%{gem_name} Version: %{mainver} @@ -102,6 +102,9 @@ ruby -rubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Mon Nov 13 2017 Mamoru TASAKA - 3.7.0-1 +- Enable tests again + * Mon Nov 13 2017 Mamoru TASAKA - 3.7.0-0.1 - 3.7.0 - Once disable tests From 1752504b97656e1cb1c14cb4f4aa1962682b572f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2018 13:58:32 +0900 Subject: [PATCH 16/72] 3.7.1 --- .gitignore | 2 ++ rubygem-rspec-support.spec | 7 ++++++- sources | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26f35c3..21047f3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 23b3d6d..07c02cc 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.7.0 +%global mainver 3.7.1 %undefine prever %global mainrel 1 @@ -8,6 +8,8 @@ %global need_bootstrap_set 0 +%undefine __brp_mangle_shebangs + Name: rubygem-%{gem_name} Version: %{mainver} Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} @@ -102,6 +104,9 @@ ruby -rubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Fri Feb 9 2018 Mamoru TASAKA - 3.7.1-1 +- 3.7.1 + * Mon Nov 13 2017 Mamoru TASAKA - 3.7.0-1 - Enable tests again diff --git a/sources b/sources index 6c3b243..95dcc6e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.7.0.gem) = 50b23dc2da21c638b552b55651d551759b139b6a16f3cbdd38d9ced41fbdbab808cc034800d3e98126cfadf2a03db479493811478cb7a4b751a98f252b57867d -SHA512 (rubygem-rspec-support-3.7.0-full.tar.gz) = e6b82652df9d7e2f5b7f43f83c32c77e85d6e1d44db87538ab7b2dfd04c714930318e21ea42cbf85fd03b1ac595c78a1019fc78f3d61884a01e9c4257ec7dd12 +SHA512 (rspec-support-3.7.1.gem) = 0f4c70d446d3dd0890adface47d14a138409c2b6e2ec207b7ecef87ff6baeeab14f1f905c52e1b0104854faaef3f28ab468667fe3072227333f48d73e44ad9a4 +SHA512 (rubygem-rspec-support-3.7.1-full.tar.gz) = 818343c575a07e31387dfaa5ef7e7416b536ff837099114e892f5cc40d28ef9b280d9c4a0f875c8a56fd250019fcecb687d75ef7e5b2328e44e112d6a1cff006 From 048d38eadba1403f1225d6d43456a3eca9b1ac01 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2018 14:23:56 +0900 Subject: [PATCH 17/72] -rubygems usage removed on ruby2.5.. --- rubygem-rspec-support.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 07c02cc..c79e21a 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -86,8 +86,8 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { ${FAILFILE[$i]} } -ruby -rubygems -Ilib/ -S rspec spec/ || \ - ruby -rubygems -Ilib/ -S rspec --tag ~broken +ruby -rrubygems -Ilib/ -S rspec spec/ || \ + ruby -rrubygems -Ilib/ -S rspec --tag ~broken %endif %files From b1a6eb268677850430fa21e413c4db55bedf5e1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 04:44:00 +0000 Subject: [PATCH 18/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index c79e21a..d449b21 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series Group: Development/Languages @@ -104,6 +104,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.7.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 9 2018 Mamoru TASAKA - 3.7.1-1 - 3.7.1 From 8685b0961f3449becc48ea2fac9163b57217aee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 18 Nov 2018 22:43:28 +0100 Subject: [PATCH 19/72] Use C.UTF-8 locale --- rubygem-rspec-support.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index d449b21..b68ba45 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,14 +12,14 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.2 Summary: Common functionality to Rspec series Group: Development/Languages License: MIT URL: https://github.com/rspec/rspec-support Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem -# %%{SOURCE2} %%{name} %%{version} +# %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh # tweak regex for search path @@ -70,7 +70,7 @@ cp -pa .%{gem_dir}/* \ %if 0%{?need_bootstrap_set} < 1 %check -LANG=en_US.UTF-8 +LANG=C.UTF-8 # Test failure needs investigation... FAILFILE=() @@ -104,6 +104,10 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 3.7.1-1.2 +- Use C.UTF-8 locale + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + * Sat Jul 14 2018 Fedora Release Engineering - 3.7.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d000d5a0fed7034a6098ec76770c933ff5db9b30 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Dec 2018 14:08:17 +0900 Subject: [PATCH 20/72] 3.8.0 Once disable test for bootstrap --- .gitignore | 2 ++ rubygem-rspec-support.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 21047f3..5a9c765 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index b68ba45..a626e51 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,9 +1,9 @@ %global gem_name rspec-support -%global mainver 3.7.1 +%global mainver 3.8.0 %undefine prever -%global mainrel 1 +%global mainrel 0.1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 0 @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.2 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series Group: Development/Languages @@ -104,6 +104,10 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Wed Dec 12 2018 Mamoru TASAKA - 3.8.0-0.1 +- 3.8.0 +- Once disable test for bootstrap + * Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 3.7.1-1.2 - Use C.UTF-8 locale See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot diff --git a/sources b/sources index 95dcc6e..f9713cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.7.1.gem) = 0f4c70d446d3dd0890adface47d14a138409c2b6e2ec207b7ecef87ff6baeeab14f1f905c52e1b0104854faaef3f28ab468667fe3072227333f48d73e44ad9a4 -SHA512 (rubygem-rspec-support-3.7.1-full.tar.gz) = 818343c575a07e31387dfaa5ef7e7416b536ff837099114e892f5cc40d28ef9b280d9c4a0f875c8a56fd250019fcecb687d75ef7e5b2328e44e112d6a1cff006 +SHA512 (rspec-support-3.8.0.gem) = b508ade0607a7628eb281fd4347d70eb43759d4a92e694588d8e0dc276f64caf522f4bc6d18c8e3e5cfd8317f9f96473f7322452590f12877c1a05c5f736b4c5 +SHA512 (rubygem-rspec-support-3.8.0-full.tar.gz) = 2ad9fe3b06aa2620c3ca506fbdd6ceb89b023caca06a9d02507083afc2780156d0ffe9f7e1f8e99744bb11fe6fd36a981f65c73863c80a5d37c663b164f6c1e1 From 6238b10fd3f8f9f94619f62a8e1c954775be43f3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Dec 2018 14:22:01 +0900 Subject: [PATCH 21/72] oops.. --- rubygem-rspec-support.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index a626e51..94e1088 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -6,7 +6,7 @@ %global mainrel 0.1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %undefine __brp_mangle_shebangs From 69fe11af39ed826cc6b21a1e45ac5a5e489b7ffd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Dec 2018 14:53:08 +0900 Subject: [PATCH 22/72] Enable tests again --- rubygem-rspec-support.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 94e1088..f4f0a73 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,10 +3,10 @@ %global mainver 3.8.0 %undefine prever -%global mainrel 0.1 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %undefine __brp_mangle_shebangs @@ -104,6 +104,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Thu Dec 13 2018 Mamoru TASAKA - 3.8.0-1 +- Enable tests again + * Wed Dec 12 2018 Mamoru TASAKA - 3.8.0-0.1 - 3.8.0 - Once disable test for bootstrap From 36ce14fe306023a8805a7e9634cf78a363e7e55f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:23 +0100 Subject: [PATCH 23/72] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- rubygem-rspec-support.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index f4f0a73..4e67caa 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -15,7 +15,6 @@ Version: %{mainver} Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series -Group: Development/Languages License: MIT URL: https://github.com/rspec/rspec-support Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem @@ -43,7 +42,6 @@ suitable for internal use only at this time. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} BuildArch: noarch From 43f4d311f79e5c5cf1b5d1ec8441d7dc1ad9da5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 12:57:55 +0000 Subject: [PATCH 24/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 4e67caa..bde5925 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.8.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Dec 13 2018 Mamoru TASAKA - 3.8.0-1 - Enable tests again From 1d56b58e28607118979fe2799e4b7e792f7060db Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Feb 2019 12:45:35 +0900 Subject: [PATCH 25/72] Backport upstream patch for ruby 2.6 changes --- ...line_number-spec-for-change-in-Ruby-.patch | 41 +++++++++++++++++++ rubygem-rspec-support.spec | 14 +++++-- 2 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch diff --git a/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch b/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch new file mode 100644 index 0000000..4e3bf3c --- /dev/null +++ b/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch @@ -0,0 +1,41 @@ +From a0e30cc7c8021067b78510b7cd29a7442adc34cb Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Wed, 26 Dec 2018 22:31:28 +0000 +Subject: [PATCH 09/13] Update nodes_by_line_number spec for change in Ruby + behaviour + +--- + spec/rspec/support/source_spec.rb | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/spec/rspec/support/source_spec.rb b/spec/rspec/support/source_spec.rb +index 0e3d569..56532ce 100644 +--- a/spec/rspec/support/source_spec.rb ++++ b/spec/rspec/support/source_spec.rb +@@ -79,10 +79,19 @@ module RSpec::Support + describe '#nodes_by_line_number' do + it 'returns a hash containing nodes for each line number' do + expect(source.nodes_by_line_number).to match( +- 1 => [ +- an_object_having_attributes(:type => :@int), +- an_object_having_attributes(:type => :@ident) +- ], ++ 1 => ++ if RUBY_VERSION >= '2.6.0' ++ [ ++ an_object_having_attributes(:type => :@int), ++ an_object_having_attributes(:type => :@period), ++ an_object_having_attributes(:type => :@ident) ++ ] ++ else ++ [ ++ an_object_having_attributes(:type => :@int), ++ an_object_having_attributes(:type => :@ident) ++ ] ++ end, + 2 => [ + an_object_having_attributes(:type => :@ident), + an_object_having_attributes(:type => :@ident) +-- +2.20.1 + diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index bde5925..838a313 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.8.0 %undefine prever -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 0 @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series License: MIT @@ -21,8 +21,10 @@ 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 +# Patches from upstream: +Patch9: 0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch # tweak regex for search path -Patch0: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch +Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -55,7 +57,8 @@ Documentation for %{name} %setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch0 -p1 +%patch100 -p1 +%patch9 -p1 %build gem build %{gem_name}.gemspec @@ -102,6 +105,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Tue Feb 5 2019 Mamoru TASAKA - 3.8.0-2 +- Backport upstream patch for ruby 2.6 changes + * Sat Feb 02 2019 Fedora Release Engineering - 3.8.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 477896f63c9e85d88ca406a5c44740772e196773 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 21 Jun 2019 16:06:37 +0900 Subject: [PATCH 26/72] 3.8.2 --- .gitignore | 2 + ...line_number-spec-for-change-in-Ruby-.patch | 41 ------------------- rubygem-rspec-support.spec | 10 ++--- sources | 4 +- 4 files changed, 9 insertions(+), 48 deletions(-) delete mode 100644 0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch diff --git a/.gitignore b/.gitignore index 5a9c765..5037bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /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 diff --git a/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch b/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch deleted file mode 100644 index 4e3bf3c..0000000 --- a/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a0e30cc7c8021067b78510b7cd29a7442adc34cb Mon Sep 17 00:00:00 2001 -From: Jon Rowe -Date: Wed, 26 Dec 2018 22:31:28 +0000 -Subject: [PATCH 09/13] Update nodes_by_line_number spec for change in Ruby - behaviour - ---- - spec/rspec/support/source_spec.rb | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/spec/rspec/support/source_spec.rb b/spec/rspec/support/source_spec.rb -index 0e3d569..56532ce 100644 ---- a/spec/rspec/support/source_spec.rb -+++ b/spec/rspec/support/source_spec.rb -@@ -79,10 +79,19 @@ module RSpec::Support - describe '#nodes_by_line_number' do - it 'returns a hash containing nodes for each line number' do - expect(source.nodes_by_line_number).to match( -- 1 => [ -- an_object_having_attributes(:type => :@int), -- an_object_having_attributes(:type => :@ident) -- ], -+ 1 => -+ if RUBY_VERSION >= '2.6.0' -+ [ -+ an_object_having_attributes(:type => :@int), -+ an_object_having_attributes(:type => :@period), -+ an_object_having_attributes(:type => :@ident) -+ ] -+ else -+ [ -+ an_object_having_attributes(:type => :@int), -+ an_object_having_attributes(:type => :@ident) -+ ] -+ end, - 2 => [ - an_object_having_attributes(:type => :@ident), - an_object_having_attributes(:type => :@ident) --- -2.20.1 - diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 838a313..f66b73b 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,9 +1,9 @@ %global gem_name rspec-support -%global mainver 3.8.0 +%global mainver 3.8.2 %undefine prever -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 0 @@ -21,8 +21,6 @@ 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 -# Patches from upstream: -Patch9: 0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch # tweak regex for search path Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch @@ -58,7 +56,6 @@ Documentation for %{name} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec %patch100 -p1 -%patch9 -p1 %build gem build %{gem_name}.gemspec @@ -105,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Fri Jun 21 2019 Mamoru TASAKA - 3.8.2-1 +- 3.8.2 + * Tue Feb 5 2019 Mamoru TASAKA - 3.8.0-2 - Backport upstream patch for ruby 2.6 changes diff --git a/sources b/sources index f9713cb..698434a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.8.0.gem) = b508ade0607a7628eb281fd4347d70eb43759d4a92e694588d8e0dc276f64caf522f4bc6d18c8e3e5cfd8317f9f96473f7322452590f12877c1a05c5f736b4c5 -SHA512 (rubygem-rspec-support-3.8.0-full.tar.gz) = 2ad9fe3b06aa2620c3ca506fbdd6ceb89b023caca06a9d02507083afc2780156d0ffe9f7e1f8e99744bb11fe6fd36a981f65c73863c80a5d37c663b164f6c1e1 +SHA512 (rspec-support-3.8.2.gem) = 7239db4eb2da594a410078d397bfedd524270f31f825bfcd12540278ad724a0383af77afbae2a8fd716c8309408e64c2922a39b3ce09032d66d5ab161f4a05c8 +SHA512 (rubygem-rspec-support-3.8.2-full.tar.gz) = 4a8a900d631257a050ce542a9d231e9b66344137a37f47ab1ad95979a39758405b2ce8b264393c9624860a86499f733d408e9a62e8e167dcab1dabc134687783 From e441fdb86c800b7d2d01195d3b5630ae26f31088 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 20:03:46 +0000 Subject: [PATCH 27/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index f66b73b..1752df8 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 3.8.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 21 2019 Mamoru TASAKA - 3.8.2-1 - 3.8.2 From 54dcef14419e08846e216b2704ea2b57597bdc8b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Dec 2019 14:59:55 +0900 Subject: [PATCH 28/72] 3.9.0 Once disable test for bootstrap --- .gitignore | 2 ++ rubygem-rspec-support.spec | 12 ++++++++---- sources | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5037bf5..5561a78 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 1752df8..6f92887 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,18 +1,18 @@ %global gem_name rspec-support -%global mainver 3.8.2 +%global mainver 3.9.0 %undefine prever -%global mainrel 1 +%global mainrel 0.1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %undefine __brp_mangle_shebangs Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series License: MIT @@ -102,6 +102,10 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Tue Dec 10 2019 amoru TASAKA - 3.9.0-0.1 +- 3.9.0 +- Once disable test for bootstrap + * Fri Jul 26 2019 Fedora Release Engineering - 3.8.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 698434a..d14eaaf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.8.2.gem) = 7239db4eb2da594a410078d397bfedd524270f31f825bfcd12540278ad724a0383af77afbae2a8fd716c8309408e64c2922a39b3ce09032d66d5ab161f4a05c8 -SHA512 (rubygem-rspec-support-3.8.2-full.tar.gz) = 4a8a900d631257a050ce542a9d231e9b66344137a37f47ab1ad95979a39758405b2ce8b264393c9624860a86499f733d408e9a62e8e167dcab1dabc134687783 +SHA512 (rspec-support-3.9.0.gem) = c3b5ae18ebc31341f0e2e56761aa46e3774238485eb631bfba3234afb30fa6e21c2a51894ea89c35d240b7044546932600291f0b52d18106851ae50d6bdfc997 +SHA512 (rubygem-rspec-support-3.9.0-full.tar.gz) = db659142b0fef5643b221312b7e17f832b2aaba84f39bf55a69f32c8dd648c784e20e80651295577722a275243e5b419adbdcb88ece00d5ae6b218544dd2e006 From b4804ade32bd6ff6cd5afc0863b7830bcb57cdfe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Dec 2019 15:52:58 +0900 Subject: [PATCH 29/72] Enable tests again --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 6f92887..e537751 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.9.0 %undefine prever -%global mainrel 0.1 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 1 @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Tue Dec 10 2019 amoru TASAKA - 3.9.0-1 +- Enable tests again + * Tue Dec 10 2019 amoru TASAKA - 3.9.0-0.1 - 3.9.0 - Once disable test for bootstrap From 2897fc132c51f1248b04a5586394e30b44d1dbf8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Dec 2019 16:15:44 +0900 Subject: [PATCH 30/72] enable tests again, really --- rubygem-rspec-support.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index e537751..8e62c52 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,10 +3,10 @@ %global mainver 3.9.0 %undefine prever -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %undefine __brp_mangle_shebangs @@ -102,7 +102,7 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog -* Tue Dec 10 2019 amoru TASAKA - 3.9.0-1 +* Tue Dec 10 2019 amoru TASAKA - 3.9.0-2 - Enable tests again * Tue Dec 10 2019 amoru TASAKA - 3.9.0-0.1 From a8a5861a2967320f270935ddfec7daa1423d4ada Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2019 11:15:29 +0900 Subject: [PATCH 31/72] 3.9.1 --- .gitignore | 1 + rubygem-rspec-support.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5561a78..996e4d8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 8e62c52..42bc861 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,9 +1,9 @@ %global gem_name rspec-support -%global mainver 3.9.0 +%global mainver 3.9.1 %undefine prever -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 0 @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Mon Dec 30 2019 amoru TASAKA - 3.9.1-1 +- 3.9.1 + * Tue Dec 10 2019 amoru TASAKA - 3.9.0-2 - Enable tests again diff --git a/sources b/sources index d14eaaf..c12e894 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (rspec-support-3.9.0.gem) = c3b5ae18ebc31341f0e2e56761aa46e3774238485eb631bfba3234afb30fa6e21c2a51894ea89c35d240b7044546932600291f0b52d18106851ae50d6bdfc997 -SHA512 (rubygem-rspec-support-3.9.0-full.tar.gz) = db659142b0fef5643b221312b7e17f832b2aaba84f39bf55a69f32c8dd648c784e20e80651295577722a275243e5b419adbdcb88ece00d5ae6b218544dd2e006 +SHA512 (rspec-support-3.9.1.gem) = 04eb16b8c178f1cb01dcd68a4515898ab1db966bc916fdff13a50809372e730e3c30392a2235762b4c5f9328d9cd624cec3541aedd5255d803659f81e1e87191 From 3357d2b90bf0315972d4433589d38c737c004ec9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2019 11:19:43 +0900 Subject: [PATCH 32/72] add missing sources --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 996e4d8..6cf14d5 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /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 diff --git a/sources b/sources index c12e894..fe2be93 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (rspec-support-3.9.1.gem) = 04eb16b8c178f1cb01dcd68a4515898ab1db966bc916fdff13a50809372e730e3c30392a2235762b4c5f9328d9cd624cec3541aedd5255d803659f81e1e87191 +SHA512 (rubygem-rspec-support-3.9.1-full.tar.gz) = 3f64f77c8247290ced91cda87b0eb8fc482a78563ed405000340da83e1e6414520b54fe2dbd320b20f3bc7fa10f71eb37407cdceb261dc2b43996e6d2e4cda3d From 951f14dbac22e97de6e2ef18aa61987559f6fece Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2019 22:19:01 +0900 Subject: [PATCH 33/72] 3.9.2 --- .gitignore | 2 ++ rubygem-rspec-support.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6cf14d5..093c7c5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 42bc861..c974d3a 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.9.1 +%global mainver 3.9.2 %undefine prever %global mainrel 1 @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Mon Dec 30 2019 amoru TASAKA - 3.9.2-1 +- 3.9.2 + * Mon Dec 30 2019 amoru TASAKA - 3.9.1-1 - 3.9.1 diff --git a/sources b/sources index fe2be93..a5c207a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.9.1.gem) = 04eb16b8c178f1cb01dcd68a4515898ab1db966bc916fdff13a50809372e730e3c30392a2235762b4c5f9328d9cd624cec3541aedd5255d803659f81e1e87191 -SHA512 (rubygem-rspec-support-3.9.1-full.tar.gz) = 3f64f77c8247290ced91cda87b0eb8fc482a78563ed405000340da83e1e6414520b54fe2dbd320b20f3bc7fa10f71eb37407cdceb261dc2b43996e6d2e4cda3d +SHA512 (rspec-support-3.9.2.gem) = c8cc257e308a139e66bbee41abde2951b6bc423c6df22280e8d70d66160b6a2cedff2aee8146f96c64dcdcf56cbb80151cea4475c5ead3cb8ba248ad15e48bef +SHA512 (rubygem-rspec-support-3.9.2-full.tar.gz) = 1def2f0d284d26c0fa1450241b21ed36b9bda5c263b38945c050fd83ee6fe0528466a641e0e0d50d79bb0a72f8066fe7b011b69ee426609126e177a6620e2505 From 733b9e1d21f858d34c9314a45aded404344e9e2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 19:18:36 +0000 Subject: [PATCH 34/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index c974d3a..849ba30 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.9.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 30 2019 amoru TASAKA - 3.9.2-1 - 3.9.2 From c3fbad6c473eb2392086af5778f886e29fe52fb3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 May 2020 14:19:03 +0900 Subject: [PATCH 35/72] 3.9.3 --- .gitignore | 2 ++ rubygem-rspec-support.spec | 16 ++++++++++------ sources | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 093c7c5..513e30e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 849ba30..79d62f6 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.9.2 +%global mainver 3.9.3 %undefine prever %global mainrel 1 @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series License: MIT @@ -102,19 +102,23 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Sun May 3 2020 Mamoru TASAKA - 3.9.3-1 +- 3.9.3 + + * Thu Jan 30 2020 Fedora Release Engineering - 3.9.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Mon Dec 30 2019 amoru TASAKA - 3.9.2-1 +* Mon Dec 30 2019 Mamoru TASAKA - 3.9.2-1 - 3.9.2 -* Mon Dec 30 2019 amoru TASAKA - 3.9.1-1 +* Mon Dec 30 2019 Mamoru TASAKA - 3.9.1-1 - 3.9.1 -* Tue Dec 10 2019 amoru TASAKA - 3.9.0-2 +* Tue Dec 10 2019 Mamoru TASAKA - 3.9.0-2 - Enable tests again -* Tue Dec 10 2019 amoru TASAKA - 3.9.0-0.1 +* Tue Dec 10 2019 Mamoru TASAKA - 3.9.0-0.1 - 3.9.0 - Once disable test for bootstrap diff --git a/sources b/sources index a5c207a..954751f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.9.2.gem) = c8cc257e308a139e66bbee41abde2951b6bc423c6df22280e8d70d66160b6a2cedff2aee8146f96c64dcdcf56cbb80151cea4475c5ead3cb8ba248ad15e48bef -SHA512 (rubygem-rspec-support-3.9.2-full.tar.gz) = 1def2f0d284d26c0fa1450241b21ed36b9bda5c263b38945c050fd83ee6fe0528466a641e0e0d50d79bb0a72f8066fe7b011b69ee426609126e177a6620e2505 +SHA512 (rspec-support-3.9.3.gem) = fe469a7138478f16de941743ddb5860dec6e2c3e4b8d7fc5b258465f892929932702aeffb9a574300535cb1d91417549ae29d17e9df74da85b95a032b3b9b13c +SHA512 (rubygem-rspec-support-3.9.3-full.tar.gz) = a543b700fb3e47b65bc99c475ce81eadc6d7627f9828112d0c83719d75fcfc2fe60ffdcc1b3e7ac56b4a1532ba1ebe4d44f5a5e134e8162d587bb223fefd05e9 From da0a03f80dbb1ba22d8be1a8d253345770c6bb1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 07:01:06 +0000 Subject: [PATCH 36/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 79d62f6..4c977b8 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.9.3-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun May 3 2020 Mamoru TASAKA - 3.9.3-1 - 3.9.3 From 47350178e17f58266e055cc611ebbfd6e908e329 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 11 Dec 2020 14:42:20 +0900 Subject: [PATCH 37/72] 3.10.0 Once disable test for bootstrap --- .gitignore | 2 ++ rubygem-rspec-support.spec | 17 +++++++++++++---- sources | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 513e30e..2d369af 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 4c977b8..0f0c47c 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,18 +1,18 @@ %global gem_name rspec-support -%global mainver 3.9.3 +%global mainver 3.10.0 %undefine prever -%global mainrel 1 +%global mainrel 0.1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %undefine __brp_mangle_shebangs Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series License: MIT @@ -101,7 +101,16 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %files doc %doc %{gem_docdir} +%if 0 +* Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-1 +- Enable tests again +%endif + %changelog +* Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-0.1 +- 3.10.0 +- Once disable test for bootstrap + * Wed Jul 29 2020 Fedora Release Engineering - 3.9.3-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 954751f..2b84325 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.9.3.gem) = fe469a7138478f16de941743ddb5860dec6e2c3e4b8d7fc5b258465f892929932702aeffb9a574300535cb1d91417549ae29d17e9df74da85b95a032b3b9b13c -SHA512 (rubygem-rspec-support-3.9.3-full.tar.gz) = a543b700fb3e47b65bc99c475ce81eadc6d7627f9828112d0c83719d75fcfc2fe60ffdcc1b3e7ac56b4a1532ba1ebe4d44f5a5e134e8162d587bb223fefd05e9 +SHA512 (rspec-support-3.10.0.gem) = 3af8255cebb4ed6ae0f34d766f251dfd89a99447acb333cbe9269cb1e2754fae6c88c984dd7903df2c27135a76111684660ba15c2efdf283d66d4c1a5980a571 +SHA512 (rubygem-rspec-support-3.10.0-full.tar.gz) = 6fd1d81ebbe5a72beaf1857c23c6c33d7102525c65964a6c317b2158860032eb0183730e815b3e77dd838579592e703216d32960cb223ec4d98dda1ffdfc7f1b From 4170952d1901d6e2f181757e7af7b32f6b62b586 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 11 Dec 2020 15:16:20 +0900 Subject: [PATCH 38/72] Enable tests again --- rubygem-rspec-support.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 0f0c47c..f0c94d1 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,10 +3,10 @@ %global mainver 3.10.0 %undefine prever -%global mainrel 0.1 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %undefine __brp_mangle_shebangs @@ -101,12 +101,10 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %files doc %doc %{gem_docdir} -%if 0 +%changelog * Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-1 - Enable tests again -%endif -%changelog * Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-0.1 - 3.10.0 - Once disable test for bootstrap From 65229d34bade98ac931ab54642ca904607efbf0d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 29 Dec 2020 14:38:30 +0900 Subject: [PATCH 39/72] 3.10.1 --- .gitignore | 2 ++ rubygem-rspec-support.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d369af..14edca8 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index f0c94d1..5b3d70d 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.10.0 +%global mainver 3.10.1 %undefine prever %global mainrel 1 @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Tue Dec 29 2020 Mamoru TASAKA - 3.10.1-1 +- 3.10.1 + * Fri Dec 11 2020 Mamoru TASAKA - 3.10.0-1 - Enable tests again diff --git a/sources b/sources index 2b84325..515af21 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.10.0.gem) = 3af8255cebb4ed6ae0f34d766f251dfd89a99447acb333cbe9269cb1e2754fae6c88c984dd7903df2c27135a76111684660ba15c2efdf283d66d4c1a5980a571 -SHA512 (rubygem-rspec-support-3.10.0-full.tar.gz) = 6fd1d81ebbe5a72beaf1857c23c6c33d7102525c65964a6c317b2158860032eb0183730e815b3e77dd838579592e703216d32960cb223ec4d98dda1ffdfc7f1b +SHA512 (rspec-support-3.10.1.gem) = 2ee4661274b5a2e1c9505728381b13c3de4b9bb919be6ce257c73d4137998f27b95133df0af35a64996a7aa1f7490771986407d56f13717a6dd5e5b6afaba940 +SHA512 (rubygem-rspec-support-3.10.1-full.tar.gz) = f99cd4d888631fa030d9b7f21edccf62f0ba5adf1bf90d77a960d8b85c1444577f30ae36d7f0983a85aae00f5d7db1bb3679c66cd06852cf75ce398f2eed6dc2 From 3019b26ee9eb0ad3fa375c7a760ae4606fb0dda0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 16:26:45 +0000 Subject: [PATCH 40/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 5b3d70d..2a18c73 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -102,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.10.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 29 2020 Mamoru TASAKA - 3.10.1-1 - 3.10.1 From 8fada6733fab9c3e59e91a14be4b9a1327895b06 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 1 Feb 2021 15:20:07 +0900 Subject: [PATCH 41/72] 3.10.2 --- .gitignore | 2 ++ rubygem-rspec-support.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 14edca8..6836666 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 2a18c73..c826b6b 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.10.1 +%global mainver 3.10.2 %undefine prever %global mainrel 1 @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series License: MIT @@ -68,6 +68,7 @@ cp -pa .%{gem_dir}/* \ %if 0%{?need_bootstrap_set} < 1 %check +# UTF-8 is needed LANG=C.UTF-8 # Test failure needs investigation... @@ -102,6 +103,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Mon Feb 1 2021 Mamoru TASAKA - 3.10.2-1 +- 3.10.2 + * Wed Jan 27 2021 Fedora Release Engineering - 3.10.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 515af21..c533678 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.10.1.gem) = 2ee4661274b5a2e1c9505728381b13c3de4b9bb919be6ce257c73d4137998f27b95133df0af35a64996a7aa1f7490771986407d56f13717a6dd5e5b6afaba940 -SHA512 (rubygem-rspec-support-3.10.1-full.tar.gz) = f99cd4d888631fa030d9b7f21edccf62f0ba5adf1bf90d77a960d8b85c1444577f30ae36d7f0983a85aae00f5d7db1bb3679c66cd06852cf75ce398f2eed6dc2 +SHA512 (rspec-support-3.10.2.gem) = c8825dbf8fc5f044de65400fb3f4d6f4d9352167b40caef904afecdc12ae1e4156590a20f222cf841887549d59a88a057bd503759147cf8ec4ddd05679732e1f +SHA512 (rubygem-rspec-support-3.10.2-full.tar.gz) = c4e4f59eb8a51c00071abcd5630708cf8049eb32c1741ce64275a5480bbc27691b808104fab567e75c6b27cf51cab525d4530b357dca20d7ddb014daeb34a49d From 6e5148fd973e9ac0df92448564e5af295c0570ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 12:38:21 +0000 Subject: [PATCH 42/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index c826b6b..1590b92 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -103,6 +103,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.10.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Feb 1 2021 Mamoru TASAKA - 3.10.2-1 - 3.10.2 From 60ae04a39f65e8c34aacc903516188feb0b496af Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 Nov 2021 14:17:48 +0900 Subject: [PATCH 43/72] 3.10.3 --- .gitignore | 2 ++ rubygem-rspec-support.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6836666..33c516b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ /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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 1590b92..e268c42 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.10.2 +%global mainver 3.10.3 %undefine prever %global mainrel 1 @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series License: MIT @@ -103,6 +103,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Thu Nov 4 2021 Mamoru TASAKA - 3.10.3-1 +- 3.10.3 + * Fri Jul 23 2021 Fedora Release Engineering - 3.10.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index c533678..48aa18e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.10.2.gem) = c8825dbf8fc5f044de65400fb3f4d6f4d9352167b40caef904afecdc12ae1e4156590a20f222cf841887549d59a88a057bd503759147cf8ec4ddd05679732e1f -SHA512 (rubygem-rspec-support-3.10.2-full.tar.gz) = c4e4f59eb8a51c00071abcd5630708cf8049eb32c1741ce64275a5480bbc27691b808104fab567e75c6b27cf51cab525d4530b357dca20d7ddb014daeb34a49d +SHA512 (rspec-support-3.10.3.gem) = edeaf7d77472446fd126b851621ae7a54923e56d64c8ca34a99a9b87c53f8548a06edad86f04c7719a3cd781d9fdd9b7d2c519c084c9579df8c549b191d1c16d +SHA512 (rubygem-rspec-support-3.10.3-full.tar.gz) = becabc46f5c25e7dbedb549882f1b9d3ff74805ca581b15f4bb782862500dfbce9f1a699dffeeaf0f0aa4dc702dc3200abf6de743a5cf9f7fc09c1b3ca7bacc0 From 9c0bb086b712ad7fe81e60e5c8141a24b1978699 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 19:11:44 +0000 Subject: [PATCH 44/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index e268c42..db83273 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -103,6 +103,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.10.3-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Nov 4 2021 Mamoru TASAKA - 3.10.3-1 - 3.10.3 From 0b31a53e1602cfd2ea2c2ae736061ab3ee72f01f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 29 Jan 2022 23:37:26 +0900 Subject: [PATCH 45/72] BR: rubygem(rake) for %check --- rubygem-rspec-support.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index db83273..4aac309 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.10.3 %undefine prever -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 0 @@ -30,6 +30,9 @@ BuildRequires: rubygems-devel 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 @@ -103,6 +106,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Sat Jan 29 2022 Mamoru TASAKA - 3.10.3-2 +- BR: rubygem(rake) for %%check + * Fri Jan 21 2022 Fedora Release Engineering - 3.10.3-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b344de242eb8cd4db4720c6b1498bcab141e08e8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 10 Feb 2022 12:33:09 +0900 Subject: [PATCH 46/72] 3.11.0 --- .gitignore | 42 ++------------------------------------ rubygem-rspec-support.spec | 19 +++++++++-------- sources | 4 ++-- 3 files changed, 15 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 33c516b..210213d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,40 +1,2 @@ -/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 +/rspec-support-*gem +/rubygem-rspec-support-*-full.tar.gz diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 4aac309..fd5e4ee 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,18 +1,18 @@ %global gem_name rspec-support -%global mainver 3.10.3 +%global mainver 3.11.0 %undefine prever -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%global need_bootstrap_set 0 +%bcond_without bootstrap %undefine __brp_mangle_shebangs Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series License: MIT @@ -26,7 +26,7 @@ Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel -%if 0%{?need_bootstrap_set} < 1 +%if %{without bootstrap} BuildRequires: rubygem(rspec) BuildRequires: rubygem(thread_order) BuildRequires: rubygem(bigdecimal) @@ -69,8 +69,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 @@ -88,8 +88,8 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { ${FAILFILE[$i]} } -ruby -rrubygems -Ilib/ -S rspec spec/ || \ - ruby -rrubygems -Ilib/ -S rspec --tag ~broken +export RUBYLIB=$(pwd)/lib +rspec spec/ || rspec --tag ~broken %endif %files @@ -106,6 +106,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Thu Feb 10 2022 Mamoru TASAKA - 3.11.0-1 +- 3.11.0 + * Sat Jan 29 2022 Mamoru TASAKA - 3.10.3-2 - BR: rubygem(rake) for %%check diff --git a/sources b/sources index 48aa18e..4196fca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.10.3.gem) = edeaf7d77472446fd126b851621ae7a54923e56d64c8ca34a99a9b87c53f8548a06edad86f04c7719a3cd781d9fdd9b7d2c519c084c9579df8c549b191d1c16d -SHA512 (rubygem-rspec-support-3.10.3-full.tar.gz) = becabc46f5c25e7dbedb549882f1b9d3ff74805ca581b15f4bb782862500dfbce9f1a699dffeeaf0f0aa4dc702dc3200abf6de743a5cf9f7fc09c1b3ca7bacc0 +SHA512 (rspec-support-3.11.0.gem) = c83319de87ba0ec5de25f91fa3be48473b80066004531797c151413c232dd6e141815b7ddc62b81bacf610e726b5bd11c7bac0e1abf9cc442c294156c2ff00f9 +SHA512 (rubygem-rspec-support-3.11.0-full.tar.gz) = 21ef4f2002252a38fab400a94a31daa8ae92c32ad380d8d131e4fdc586b2de9a2f40f96c9103c505790e5b64f332309f86a1b8dd784a654f7b077d263fb67780 From a149068bfec336bdd58a221dc7c7b2c42afd961c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 10 Feb 2022 13:24:33 +0900 Subject: [PATCH 47/72] kill bootstrap --- rubygem-rspec-support.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index fd5e4ee..3f141e1 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -6,7 +6,7 @@ %global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 4ddaa0a0da3fd353292e4eeb28a57f39c404c6ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 02:13:56 +0000 Subject: [PATCH 48/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 3f141e1..49bef9c 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -106,6 +106,9 @@ rspec spec/ || rspec --tag ~broken %doc %{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 b3a84f263a967e330002c582bef6ab6f137c1774 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 Sep 2022 15:39:43 +0900 Subject: [PATCH 49/72] 3.11.1 --- rubygem-rspec-support.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 49bef9c..049f146 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.11.0 +%global mainver 3.11.1 %undefine prever %global mainrel 1 @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series License: MIT @@ -106,6 +106,9 @@ rspec spec/ || rspec --tag ~broken %doc %{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 4196fca..022c877 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.11.0.gem) = c83319de87ba0ec5de25f91fa3be48473b80066004531797c151413c232dd6e141815b7ddc62b81bacf610e726b5bd11c7bac0e1abf9cc442c294156c2ff00f9 -SHA512 (rubygem-rspec-support-3.11.0-full.tar.gz) = 21ef4f2002252a38fab400a94a31daa8ae92c32ad380d8d131e4fdc586b2de9a2f40f96c9103c505790e5b64f332309f86a1b8dd784a654f7b077d263fb67780 +SHA512 (rspec-support-3.11.1.gem) = fe1b57dafc24089534f178f98fd2c323880e9312ae200e5998c4b6c628331088e84f057e714350627f8475a87330cf22928dd6ee66067b4f61db04f466cae854 +SHA512 (rubygem-rspec-support-3.11.1-full.tar.gz) = d284040287ae020f38c92538dc8f1d209d6b9ddf028b9907cf71ca3c7589b3ff9fee5325863d368d490bcc108ef9981e951f802f455cd925a2db03ea3a59b5bf From 371ab1ee7a80393248d2cbc63168172fe7ff7624 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 15:40:55 +0900 Subject: [PATCH 50/72] 3.12.0 --- rubygem-rspec-support.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 049f146..a85d83d 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,12 +1,12 @@ %global gem_name rspec-support -%global mainver 3.11.1 +%global mainver 3.12.0 %undefine prever %global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%bcond_with bootstrap +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -106,6 +106,9 @@ rspec spec/ || rspec --tag ~broken %doc %{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 022c877..b012cd4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.11.1.gem) = fe1b57dafc24089534f178f98fd2c323880e9312ae200e5998c4b6c628331088e84f057e714350627f8475a87330cf22928dd6ee66067b4f61db04f466cae854 -SHA512 (rubygem-rspec-support-3.11.1-full.tar.gz) = d284040287ae020f38c92538dc8f1d209d6b9ddf028b9907cf71ca3c7589b3ff9fee5325863d368d490bcc108ef9981e951f802f455cd925a2db03ea3a59b5bf +SHA512 (rspec-support-3.12.0.gem) = 89d18f75d83805b48375f663bba20ad5994fa0ab97a6aabfc007881ccc681d182035af8c46a9da8b3ee3ff2d9516e7836180c65eb3a7a8eea68eb5a11a881dc1 +SHA512 (rubygem-rspec-support-3.12.0-full.tar.gz) = d6621afbdcb7bbbf9fc0a2a93a25c76830676deedf81fc0152683b9e8ca452afb007072e37215c3f8769a5250bb2463c7bb5f3177cdc3cdc935d5e967bbf4bf3 From 75c9b97e48d82828b255136777ffaba729b66550 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 16:04:03 +0900 Subject: [PATCH 51/72] enable test again --- rubygem-rspec-support.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index a85d83d..f78abda 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -6,7 +6,7 @@ %global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 923bde85abc00c08e053af9dde7fb3a65ed37e33 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 2 Dec 2022 10:47:14 +0900 Subject: [PATCH 52/72] Pull upstream patch (under review) for ruby filer deadlock treatment --- ...-3.12.0-ReentrantMutex-insider-Fiber.patch | 43 +++++++++++++++++++ rubygem-rspec-support.spec | 10 ++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch diff --git a/rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch b/rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch new file mode 100644 index 0000000..bbc9e3b --- /dev/null +++ b/rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch @@ -0,0 +1,43 @@ +From 5de969f09c60fb46b75c0df0a227d8b0a60d3b95 Mon Sep 17 00:00:00 2001 +From: ojab +Date: Fri, 18 Nov 2022 15:12:19 +0000 +Subject: [PATCH] Fix `ReentrantMutex` locking inside `Fiber` spec for ruby-3.2 + +It raises `ThreadError` since https://github.com/ruby/ruby/pull/6680 +--- + spec/rspec/support/reentrant_mutex_spec.rb | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/spec/rspec/support/reentrant_mutex_spec.rb b/spec/rspec/support/reentrant_mutex_spec.rb +index 9bef54ee..34c2b27c 100644 +--- a/spec/rspec/support/reentrant_mutex_spec.rb ++++ b/spec/rspec/support/reentrant_mutex_spec.rb +@@ -28,7 +28,18 @@ + order.join_all + end + +- if RUBY_VERSION >= '3.0' ++ if RUBY_VERSION >= '3.1.3' ++ it 'raises an error when trying to lock from another Fiber' do ++ mutex.synchronize do ++ Fiber.new do ++ expect { ++ mutex.send(:enter) ++ raise 'should not reach here: mutex is already locked on different Fiber' ++ }.to raise_error(ThreadError, 'deadlock; lock already owned by another fiber belonging to the same thread') ++ end.resume ++ end ++ end ++ elsif RUBY_VERSION >= '3.0' + it 'waits when trying to lock from another Fiber' do + mutex.synchronize do + ready = false +@@ -36,7 +47,7 @@ + expect { + ready = true + mutex.send(:enter) +- raise 'should reach here: mutex is already locked on different Fiber' ++ raise 'should not reach here: mutex is already locked on different Fiber' + }.to raise_error(Exception, 'waited correctly') + end + diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index f78abda..1ed4196 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.12.0 %undefine prever -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -21,6 +21,10 @@ 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 +# https://github.com/rspec/rspec-support/pull/553 +# ruby 3.2.0 / 3.1.3 changes fiber deadlock treatment +# Tweaked for ruby 3.1.3 +Patch0: rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch # tweak regex for search path Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch @@ -58,6 +62,7 @@ Documentation for %{name} %setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%patch0 -p1 %patch100 -p1 %build @@ -106,6 +111,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Fri Dec 2 2022 Mamoru TASAKA - 3.12.0-2 +- Pull upstream patch (under review) for ruby filer deadlock treatment + * Thu Oct 27 2022 Mamoru TASAKA - 3.12.0-1 - 3.12.0 From a4aa8178d55df33bc9fbf7ace8f302bc611f19cf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 11 Dec 2022 16:49:38 +0900 Subject: [PATCH 53/72] Backport upstrem patch for pending broken test with ruby >= 3.1.3 --- ...-3.12.0-ReentrantMutex-insider-Fiber.patch | 43 ------------------- ...-support-3.12.0-pend-lock-fiber-test.patch | 28 ++++++++++++ rubygem-rspec-support.spec | 11 +++-- 3 files changed, 35 insertions(+), 47 deletions(-) delete mode 100644 rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch create mode 100644 rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch diff --git a/rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch b/rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch deleted file mode 100644 index bbc9e3b..0000000 --- a/rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 5de969f09c60fb46b75c0df0a227d8b0a60d3b95 Mon Sep 17 00:00:00 2001 -From: ojab -Date: Fri, 18 Nov 2022 15:12:19 +0000 -Subject: [PATCH] Fix `ReentrantMutex` locking inside `Fiber` spec for ruby-3.2 - -It raises `ThreadError` since https://github.com/ruby/ruby/pull/6680 ---- - spec/rspec/support/reentrant_mutex_spec.rb | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/spec/rspec/support/reentrant_mutex_spec.rb b/spec/rspec/support/reentrant_mutex_spec.rb -index 9bef54ee..34c2b27c 100644 ---- a/spec/rspec/support/reentrant_mutex_spec.rb -+++ b/spec/rspec/support/reentrant_mutex_spec.rb -@@ -28,7 +28,18 @@ - order.join_all - end - -- if RUBY_VERSION >= '3.0' -+ if RUBY_VERSION >= '3.1.3' -+ it 'raises an error when trying to lock from another Fiber' do -+ mutex.synchronize do -+ Fiber.new do -+ expect { -+ mutex.send(:enter) -+ raise 'should not reach here: mutex is already locked on different Fiber' -+ }.to raise_error(ThreadError, 'deadlock; lock already owned by another fiber belonging to the same thread') -+ end.resume -+ end -+ end -+ elsif RUBY_VERSION >= '3.0' - it 'waits when trying to lock from another Fiber' do - mutex.synchronize do - ready = false -@@ -36,7 +47,7 @@ - expect { - ready = true - mutex.send(:enter) -- raise 'should reach here: mutex is already locked on different Fiber' -+ raise 'should not reach here: mutex is already locked on different Fiber' - }.to raise_error(Exception, 'waited correctly') - end - diff --git a/rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch b/rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch new file mode 100644 index 0000000..c17d173 --- /dev/null +++ b/rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch @@ -0,0 +1,28 @@ +From 02e44fa481d5061c95d5332a91bcf7143b582bc8 Mon Sep 17 00:00:00 2001 +From: Jon Rowe +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 diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 1ed4196..5bc036b 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.12.0 %undefine prever -%global mainrel 2 +%global mainrel 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -21,10 +21,10 @@ 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 -# https://github.com/rspec/rspec-support/pull/553 +# https://github.com/rspec/rspec-support/pull/556 # ruby 3.2.0 / 3.1.3 changes fiber deadlock treatment -# Tweaked for ruby 3.1.3 -Patch0: rubygem-rspec-support-3.12.0-ReentrantMutex-insider-Fiber.patch +# Tweaked to make test suite flexible +Patch0: rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch # tweak regex for search path Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch @@ -111,6 +111,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Sun Dec 11 2022 Mamoru TASAKA - 3.12.0-3 +- Backport upstrem patch for pending broken test with ruby >= 3.1.3 + * Fri Dec 2 2022 Mamoru TASAKA - 3.12.0-2 - Pull upstream patch (under review) for ruby filer deadlock treatment From 388b69049e03d0413746d2809b799e6b29d2550e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 21:05:24 +0000 Subject: [PATCH 54/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 5bc036b..5ba8f2e 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series License: MIT @@ -111,6 +111,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 3.12.0-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Dec 11 2022 Mamoru TASAKA - 3.12.0-3 - Backport upstrem patch for pending broken test with ruby >= 3.1.3 From ca697a2cc32e1e52a904ca1c02e1df8b5691a94e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 15 Mar 2023 16:56:54 +0900 Subject: [PATCH 55/72] SPDX confirmed --- rubygem-rspec-support.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 5ba8f2e..467d76d 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -15,6 +15,7 @@ Version: %{mainver} Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Summary: Common functionality to Rspec series +# SPDX confirmed License: MIT URL: https://github.com/rspec/rspec-support Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem From 4cac91d0644d6528cbcc4d4b4397a9a21e20907b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:29:49 +0900 Subject: [PATCH 56/72] use baserelease --- rubygem-rspec-support.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 467d76d..3c1e8b2 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.12.0 %undefine prever -%global mainrel 3 +%global baserelease 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -12,7 +12,7 @@ Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series # SPDX confirmed From 35aad8391e8eb88e2293c84763bc08c98b2a2152 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 1 Jul 2023 16:13:53 +0900 Subject: [PATCH 57/72] 3.12.1 --- rubygem-rspec-support.spec | 14 ++++++-------- sources | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 3c1e8b2..15a08b9 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,9 +1,9 @@ %global gem_name rspec-support -%global mainver 3.12.0 +%global mainver 3.12.1 %undefine prever -%global baserelease 3 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -22,10 +22,6 @@ 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 -# https://github.com/rspec/rspec-support/pull/556 -# ruby 3.2.0 / 3.1.3 changes fiber deadlock treatment -# Tweaked to make test suite flexible -Patch0: rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch # tweak regex for search path Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch @@ -63,8 +59,7 @@ Documentation for %{name} %setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch0 -p1 -%patch100 -p1 +%patch -P100 -p1 %build gem build %{gem_name}.gemspec @@ -112,6 +107,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Sat Jul 1 2023 Mamoru TASAKA - 3.12.1-1 +- 3.12.1 + * Fri Jan 20 2023 Fedora Release Engineering - 3.12.0-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b012cd4..ed9c422 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.12.0.gem) = 89d18f75d83805b48375f663bba20ad5994fa0ab97a6aabfc007881ccc681d182035af8c46a9da8b3ee3ff2d9516e7836180c65eb3a7a8eea68eb5a11a881dc1 -SHA512 (rubygem-rspec-support-3.12.0-full.tar.gz) = d6621afbdcb7bbbf9fc0a2a93a25c76830676deedf81fc0152683b9e8ca452afb007072e37215c3f8769a5250bb2463c7bb5f3177cdc3cdc935d5e967bbf4bf3 +SHA512 (rspec-support-3.12.1.gem) = 4fe1428d898d5eda81c91276fc05cc3d21320f104a593c8285a051bd7c61c0ded16a9f4da3c75d9e14190169d49d28fc6ad901b525d3b69bb8c6483035d6f83b +SHA512 (rubygem-rspec-support-3.12.1-full.tar.gz) = 15e2f339f52601f7319f063519a544640147e9e6312f0a30b36cafa1a934568992fd354701c0f79459d0a10df77d70c7ed92a729636afd5518de75a0b5cbb18b From e69e5f6ce0e7d9578a0f39f2db958fea498cf2a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 18:21:11 +0000 Subject: [PATCH 58/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 15a08b9..b1125ab 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.12.1 %undefine prever -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -107,6 +107,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jul 1 2023 Mamoru TASAKA - 3.12.1-1 - 3.12.1 From e02f431348aedb27905aa3d8e434fcd2d594adbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:27:17 +0000 Subject: [PATCH 59/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index b1125ab..49c1c2a 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.12.1 %undefine prever -%global baserelease 2 +%global baserelease 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -107,6 +107,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 3.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 3.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 06bf62171525d1e36d6fa7697ade35d1c341f7f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2024 15:22:54 +0900 Subject: [PATCH 60/72] 3.13.0 --- rubygem-rspec-support.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 49c1c2a..350e806 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,12 +1,12 @@ %global gem_name rspec-support -%global mainver 3.12.1 +%global mainver 3.13.0 %undefine prever -%global baserelease 3 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%bcond_with bootstrap +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -107,6 +107,9 @@ rspec spec/ || rspec --tag ~broken %doc %{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.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index ed9c422..7d74cb1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.12.1.gem) = 4fe1428d898d5eda81c91276fc05cc3d21320f104a593c8285a051bd7c61c0ded16a9f4da3c75d9e14190169d49d28fc6ad901b525d3b69bb8c6483035d6f83b -SHA512 (rubygem-rspec-support-3.12.1-full.tar.gz) = 15e2f339f52601f7319f063519a544640147e9e6312f0a30b36cafa1a934568992fd354701c0f79459d0a10df77d70c7ed92a729636afd5518de75a0b5cbb18b +SHA512 (rspec-support-3.13.0.gem) = db0dd71efd6e502558b8b9eb10566783f82afcd32e779b0d45c2614c9149f28a0992843b8d2aab62640d857aea5aa8a5745377b01a098cd5da9fc8d206264c0c +SHA512 (rubygem-rspec-support-3.13.0-full.tar.gz) = 0dcbb87598c1ce294a4bf45102493d6bbaed09c027a967455196f3973723e57a9bdc97bce6512fed65a9f477c9940fbeabfde94edb1f38fb199c56fe7d88398a From 27ff9b6a8783db2afc636aa2f0d675ae1b026289 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2024 15:46:13 +0900 Subject: [PATCH 61/72] enable test again --- rubygem-rspec-support.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 350e806..d30b56f 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -6,7 +6,7 @@ %global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 165fc5cbe21d8fdcb5aa69b90212cdca68220d29 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Feb 2024 14:46:21 +0900 Subject: [PATCH 62/72] 3.13.1 --- rubygem-rspec-support.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index d30b56f..03c6b9c 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.13.0 +%global mainver 3.13.1 %undefine prever %global baserelease 1 @@ -107,6 +107,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Sun Feb 25 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 7d74cb1..843b09a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.13.0.gem) = db0dd71efd6e502558b8b9eb10566783f82afcd32e779b0d45c2614c9149f28a0992843b8d2aab62640d857aea5aa8a5745377b01a098cd5da9fc8d206264c0c -SHA512 (rubygem-rspec-support-3.13.0-full.tar.gz) = 0dcbb87598c1ce294a4bf45102493d6bbaed09c027a967455196f3973723e57a9bdc97bce6512fed65a9f477c9940fbeabfde94edb1f38fb199c56fe7d88398a +SHA512 (rspec-support-3.13.1.gem) = 5f6a13563ba727d6ab71738b4cbf924b645655bf415705bc9b1087cfa18762fb2fb755beac070544691f35f7fb1b278e832c1ed81443a204ca5e26c80eefb11c +SHA512 (rubygem-rspec-support-3.13.1-full.tar.gz) = 3302dd731d07e8ca52a1d1bca1d992d4b8422ad060099f621afe4435c4979f17c6f8b1fac5c6c60477bc9bd0b6bea345aae6fb3820890519adf698c297f31953 From a8f7fca08e4e22edc84131c4ca720b2743b1a6fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:55:37 +0000 Subject: [PATCH 63/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 03c6b9c..391b9f6 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.13.1 %undefine prever -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -107,6 +107,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Feb 25 2024 Mamoru TASAKA - 3.13.1-1 - 3.13.1 From 88c0df7873922eeee4d9469d9f4b6fc71db0f337 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Nov 2024 16:14:11 +0900 Subject: [PATCH 64/72] Backport upstream fix for ruby34 --- ...-pr607-ruby34-test-fix-frozen-string.patch | 43 ++++++ ...em-rspec-support-pr616-ruby34-syntax.patch | 132 ++++++++++++++++++ rubygem-rspec-support.spec | 13 +- 3 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch create mode 100644 rubygem-rspec-support-pr616-ruby34-syntax.patch diff --git a/rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch b/rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch new file mode 100644 index 0000000..d933db0 --- /dev/null +++ b/rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch @@ -0,0 +1,43 @@ +From 4592c7fbf461986a06ede4f6e76ec5d75aabb064 Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Mon, 15 Jul 2024 14:00:18 +0100 +Subject: [PATCH 1/2] Remove ostruct + +--- + spec/rspec/support/differ_spec.rb | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/spec/rspec/support/differ_spec.rb b/spec/rspec/support/differ_spec.rb +index 1a745006..83bb1242 100644 +--- a/spec/rspec/support/differ_spec.rb ++++ b/spec/rspec/support/differ_spec.rb +@@ -1,6 +1,5 @@ + # encoding: utf-8 + require 'spec_helper' +-require 'ostruct' + require 'timeout' + require 'rspec/support/spec/string_matcher' + + +From 3bbcb6507297b89082b6dd1102630f8377f0c141 Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Mon, 15 Jul 2024 14:02:13 +0100 +Subject: [PATCH 2/2] Remove string literal warning + +--- + spec/rspec/support_spec.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spec/rspec/support_spec.rb b/spec/rspec/support_spec.rb +index 75d784dd..997658b1 100644 +--- a/spec/rspec/support_spec.rb ++++ b/spec/rspec/support_spec.rb +@@ -164,7 +164,7 @@ def self.to_s + + context 'with an object having a singleton class' do + let(:object) do +- object = 'foo' ++ object = String.new('foo') + + def object.some_method + end diff --git a/rubygem-rspec-support-pr616-ruby34-syntax.patch b/rubygem-rspec-support-pr616-ruby34-syntax.patch new file mode 100644 index 0000000..92287bb --- /dev/null +++ b/rubygem-rspec-support-pr616-ruby34-syntax.patch @@ -0,0 +1,132 @@ +From 3b539d062868f3da9095075ad989ff688323923e Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Fri, 18 Oct 2024 22:19:24 +0100 +Subject: [PATCH 1/2] Handle Ruby 3.4 hash syntax changes + +--- + spec/rspec/support/object_formatter_spec.rb | 24 +++++++++++++++------ + 1 file changed, 17 insertions(+), 7 deletions(-) + +diff --git a/spec/rspec/support/object_formatter_spec.rb b/spec/rspec/support/object_formatter_spec.rb +index 4ec8ddb4d..c371c77ea 100644 +--- a/spec/rspec/support/object_formatter_spec.rb ++++ b/spec/rspec/support/object_formatter_spec.rb +@@ -27,7 +27,7 @@ module Support + # We can't count on the ordering of the hash on 1.8.7... + expect(formatted).to include(%Q{"key"=>#{formatted_time}}, %Q{#{formatted_time}=>"value"}, %Q{"nested"=>{"key"=>#{formatted_time}}}) + else +- expect(formatted).to eq(%Q{{"key"=>#{formatted_time}, #{formatted_time}=>"value", "nested"=>{"key"=>#{formatted_time}}}}) ++ expect(formatted).to eq_hash_syntax(%Q{{"key"=>#{formatted_time}, #{formatted_time}=>"value", "nested"=>{"key"=>#{formatted_time}}}}) + end + end + end +@@ -39,7 +39,7 @@ module Support + + it 'sorts keys to ensure objects are always displayed the same way' do + formatted = ObjectFormatter.format(input) +- expect(formatted).to eq expected ++ expect(formatted).to eq_hash_syntax expected + end + end + end +@@ -269,7 +269,7 @@ def self.to_s + let(:formatted_time) { ObjectFormatter.format(time) } + + it 'formats the recursive element as {...} and other elements with custom formatting' do +- expect(output).to eq("{{...}=>#{formatted_time}}") ++ expect(output).to eq_hash_syntax("{{...}=>#{formatted_time}}") + end + end + +@@ -289,7 +289,7 @@ def self.to_s + let(:formatted_time) { ObjectFormatter.format(time) } + + it 'formats the recursive element as {...} and other elements with custom formatting' do +- expect(output).to eq("{#{formatted_time}=>{...}}") ++ expect(output).to eq_hash_syntax("{#{formatted_time}=>{...}}") + end + end + +@@ -305,7 +305,7 @@ def self.to_s + end + + it 'formats the recursive element as [...]' do +- expect(output).to eq('[{:recursive_array=>[...]}]') ++ expect(output).to eq_hash_syntax('[{:recursive_array=>[...]}]') + end + end + +@@ -321,7 +321,7 @@ def self.to_s + end + + it 'formats the recursive element as {...}' do +- expect(output).to eq('{:array=>[:next_is_recursive_hash, {...}]}') ++ expect(output).to eq_hash_syntax('{:array=>[:next_is_recursive_hash, {...}]}') + end + end + +@@ -336,7 +336,7 @@ def self.to_s + end + + it 'does not omit them' do +- expect(output).to eq('[{:key=>"value"}, {:key=>"value"}]') ++ expect(output).to eq_hash_syntax('[{:key=>"value"}, {:key=>"value"}]') + end + end + +@@ -370,6 +370,16 @@ def inspect + expect(formatter.format('Test String Of A Longer Length')).to eq('"Test String Of A Longer Length"') + end + end ++ ++ if RUBY_VERSION.to_f > 3.3 ++ def eq_hash_syntax(string) ++ eq string.gsub('=>', ' => ') ++ end ++ else ++ def eq_hash_syntax(string) ++ eq string ++ end ++ end + end + end + end + +From c4364ea195fb924ab55eb6385d9cbd481e0fc878 Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Sat, 19 Oct 2024 09:39:35 +0100 +Subject: [PATCH 2/2] Adapt to hash formatting in Ruby 3.4 in the differ + +--- + spec/rspec/support/differ_spec.rb | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/spec/rspec/support/differ_spec.rb b/spec/rspec/support/differ_spec.rb +index 83bb1242c..3677cbb45 100644 +--- a/spec/rspec/support/differ_spec.rb ++++ b/spec/rspec/support/differ_spec.rb +@@ -306,6 +306,8 @@ def inspect; ""; end + | + EOD + ++ expected_diff.gsub!('=>',' => ') if RUBY_VERSION.to_f > 3.3 ++ + diff = differ.diff(expected,actual) + expect(diff).to be_diffed_as(expected_diff) + end +@@ -375,6 +377,7 @@ def inspect; ""; end + |+"c" => {"key_1"=>#{formatted_time}}, + | + EOD ++ expected_diff.gsub!('"=>','" => ') if RUBY_VERSION.to_f > 3.3 + + left_side_hash = {'c' => {'key_1' => time}} + right_side_hash = {'b' => {'key_1' => time}} +@@ -408,6 +411,7 @@ def inspect; ""; end + |+[{"a"=>#{formatted_time}}, "c"] + | + EOD ++ expected_diff.gsub!('=>',' => ') if RUBY_VERSION.to_f > 3.3 + + left_side_array = [{'a' => time}, 'c'] + right_side_array = [{'b' => time}, 'c'] diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 391b9f6..fc457d5 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.13.1 %undefine prever -%global baserelease 2 +%global baserelease 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -22,7 +22,13 @@ 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 +# https://github.com/rspec/rspec-support/pull/616/ # tweak regex for search path +# support ruby3.4 syntax +Patch1: rubygem-rspec-support-pr616-ruby34-syntax.patch +# https://github.com/rspec/rspec-support/pull/607/ +# Fix test error with ruby34 wrt frozen string +Patch2: rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch #BuildRequires: ruby(release) @@ -59,6 +65,8 @@ Documentation for %{name} %setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%patch -P1 -p1 +%patch -P2 -p1 %patch -P100 -p1 %build @@ -107,6 +115,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Wed Nov 06 2024 Mamoru TASAKA - 3.13.1-3 +- Backport upstream fix for ruby34 + * Fri Jul 19 2024 Fedora Release Engineering - 3.13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3615329671c327767eca310a61fd3b74452d5cc8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Dec 2024 23:32:15 +0900 Subject: [PATCH 65/72] 3.13.2 --- rspec-related-create-full-tarball.sh | 7 +- ...-pr607-ruby34-test-fix-frozen-string.patch | 43 ------ ...em-rspec-support-pr616-ruby34-syntax.patch | 132 ------------------ rubygem-rspec-support.spec | 16 +-- sources | 4 +- 5 files changed, 10 insertions(+), 192 deletions(-) delete mode 100644 rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch delete mode 100644 rubygem-rspec-support-pr616-ruby34-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-support-pr607-ruby34-test-fix-frozen-string.patch b/rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch deleted file mode 100644 index d933db0..0000000 --- a/rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4592c7fbf461986a06ede4f6e76ec5d75aabb064 Mon Sep 17 00:00:00 2001 -From: Jon Rowe -Date: Mon, 15 Jul 2024 14:00:18 +0100 -Subject: [PATCH 1/2] Remove ostruct - ---- - spec/rspec/support/differ_spec.rb | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/spec/rspec/support/differ_spec.rb b/spec/rspec/support/differ_spec.rb -index 1a745006..83bb1242 100644 ---- a/spec/rspec/support/differ_spec.rb -+++ b/spec/rspec/support/differ_spec.rb -@@ -1,6 +1,5 @@ - # encoding: utf-8 - require 'spec_helper' --require 'ostruct' - require 'timeout' - require 'rspec/support/spec/string_matcher' - - -From 3bbcb6507297b89082b6dd1102630f8377f0c141 Mon Sep 17 00:00:00 2001 -From: Jon Rowe -Date: Mon, 15 Jul 2024 14:02:13 +0100 -Subject: [PATCH 2/2] Remove string literal warning - ---- - spec/rspec/support_spec.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spec/rspec/support_spec.rb b/spec/rspec/support_spec.rb -index 75d784dd..997658b1 100644 ---- a/spec/rspec/support_spec.rb -+++ b/spec/rspec/support_spec.rb -@@ -164,7 +164,7 @@ def self.to_s - - context 'with an object having a singleton class' do - let(:object) do -- object = 'foo' -+ object = String.new('foo') - - def object.some_method - end diff --git a/rubygem-rspec-support-pr616-ruby34-syntax.patch b/rubygem-rspec-support-pr616-ruby34-syntax.patch deleted file mode 100644 index 92287bb..0000000 --- a/rubygem-rspec-support-pr616-ruby34-syntax.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 3b539d062868f3da9095075ad989ff688323923e Mon Sep 17 00:00:00 2001 -From: Jon Rowe -Date: Fri, 18 Oct 2024 22:19:24 +0100 -Subject: [PATCH 1/2] Handle Ruby 3.4 hash syntax changes - ---- - spec/rspec/support/object_formatter_spec.rb | 24 +++++++++++++++------ - 1 file changed, 17 insertions(+), 7 deletions(-) - -diff --git a/spec/rspec/support/object_formatter_spec.rb b/spec/rspec/support/object_formatter_spec.rb -index 4ec8ddb4d..c371c77ea 100644 ---- a/spec/rspec/support/object_formatter_spec.rb -+++ b/spec/rspec/support/object_formatter_spec.rb -@@ -27,7 +27,7 @@ module Support - # We can't count on the ordering of the hash on 1.8.7... - expect(formatted).to include(%Q{"key"=>#{formatted_time}}, %Q{#{formatted_time}=>"value"}, %Q{"nested"=>{"key"=>#{formatted_time}}}) - else -- expect(formatted).to eq(%Q{{"key"=>#{formatted_time}, #{formatted_time}=>"value", "nested"=>{"key"=>#{formatted_time}}}}) -+ expect(formatted).to eq_hash_syntax(%Q{{"key"=>#{formatted_time}, #{formatted_time}=>"value", "nested"=>{"key"=>#{formatted_time}}}}) - end - end - end -@@ -39,7 +39,7 @@ module Support - - it 'sorts keys to ensure objects are always displayed the same way' do - formatted = ObjectFormatter.format(input) -- expect(formatted).to eq expected -+ expect(formatted).to eq_hash_syntax expected - end - end - end -@@ -269,7 +269,7 @@ def self.to_s - let(:formatted_time) { ObjectFormatter.format(time) } - - it 'formats the recursive element as {...} and other elements with custom formatting' do -- expect(output).to eq("{{...}=>#{formatted_time}}") -+ expect(output).to eq_hash_syntax("{{...}=>#{formatted_time}}") - end - end - -@@ -289,7 +289,7 @@ def self.to_s - let(:formatted_time) { ObjectFormatter.format(time) } - - it 'formats the recursive element as {...} and other elements with custom formatting' do -- expect(output).to eq("{#{formatted_time}=>{...}}") -+ expect(output).to eq_hash_syntax("{#{formatted_time}=>{...}}") - end - end - -@@ -305,7 +305,7 @@ def self.to_s - end - - it 'formats the recursive element as [...]' do -- expect(output).to eq('[{:recursive_array=>[...]}]') -+ expect(output).to eq_hash_syntax('[{:recursive_array=>[...]}]') - end - end - -@@ -321,7 +321,7 @@ def self.to_s - end - - it 'formats the recursive element as {...}' do -- expect(output).to eq('{:array=>[:next_is_recursive_hash, {...}]}') -+ expect(output).to eq_hash_syntax('{:array=>[:next_is_recursive_hash, {...}]}') - end - end - -@@ -336,7 +336,7 @@ def self.to_s - end - - it 'does not omit them' do -- expect(output).to eq('[{:key=>"value"}, {:key=>"value"}]') -+ expect(output).to eq_hash_syntax('[{:key=>"value"}, {:key=>"value"}]') - end - end - -@@ -370,6 +370,16 @@ def inspect - expect(formatter.format('Test String Of A Longer Length')).to eq('"Test String Of A Longer Length"') - end - end -+ -+ if RUBY_VERSION.to_f > 3.3 -+ def eq_hash_syntax(string) -+ eq string.gsub('=>', ' => ') -+ end -+ else -+ def eq_hash_syntax(string) -+ eq string -+ end -+ end - end - end - end - -From c4364ea195fb924ab55eb6385d9cbd481e0fc878 Mon Sep 17 00:00:00 2001 -From: Jon Rowe -Date: Sat, 19 Oct 2024 09:39:35 +0100 -Subject: [PATCH 2/2] Adapt to hash formatting in Ruby 3.4 in the differ - ---- - spec/rspec/support/differ_spec.rb | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/spec/rspec/support/differ_spec.rb b/spec/rspec/support/differ_spec.rb -index 83bb1242c..3677cbb45 100644 ---- a/spec/rspec/support/differ_spec.rb -+++ b/spec/rspec/support/differ_spec.rb -@@ -306,6 +306,8 @@ def inspect; ""; end - | - EOD - -+ expected_diff.gsub!('=>',' => ') if RUBY_VERSION.to_f > 3.3 -+ - diff = differ.diff(expected,actual) - expect(diff).to be_diffed_as(expected_diff) - end -@@ -375,6 +377,7 @@ def inspect; ""; end - |+"c" => {"key_1"=>#{formatted_time}}, - | - EOD -+ expected_diff.gsub!('"=>','" => ') if RUBY_VERSION.to_f > 3.3 - - left_side_hash = {'c' => {'key_1' => time}} - right_side_hash = {'b' => {'key_1' => time}} -@@ -408,6 +411,7 @@ def inspect; ""; end - |+[{"a"=>#{formatted_time}}, "c"] - | - EOD -+ expected_diff.gsub!('=>',' => ') if RUBY_VERSION.to_f > 3.3 - - left_side_array = [{'a' => time}, 'c'] - right_side_array = [{'b' => time}, 'c'] diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index fc457d5..9e91c25 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,9 +1,9 @@ %global gem_name rspec-support -%global mainver 3.13.1 +%global mainver 3.13.2 %undefine prever -%global baserelease 3 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -22,13 +22,6 @@ 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 -# https://github.com/rspec/rspec-support/pull/616/ -# tweak regex for search path -# support ruby3.4 syntax -Patch1: rubygem-rspec-support-pr616-ruby34-syntax.patch -# https://github.com/rspec/rspec-support/pull/607/ -# Fix test error with ruby34 wrt frozen string -Patch2: rubygem-rspec-support-pr607-ruby34-test-fix-frozen-string.patch Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch #BuildRequires: ruby(release) @@ -65,8 +58,6 @@ Documentation for %{name} %setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch -P1 -p1 -%patch -P2 -p1 %patch -P100 -p1 %build @@ -115,6 +106,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Thu Dec 05 2024 Mamoru TASAKA - 3.13.2-1 +- 3.13.2 + * Wed Nov 06 2024 Mamoru TASAKA - 3.13.1-3 - Backport upstream fix for ruby34 diff --git a/sources b/sources index 843b09a..e66cc32 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.13.1.gem) = 5f6a13563ba727d6ab71738b4cbf924b645655bf415705bc9b1087cfa18762fb2fb755beac070544691f35f7fb1b278e832c1ed81443a204ca5e26c80eefb11c -SHA512 (rubygem-rspec-support-3.13.1-full.tar.gz) = 3302dd731d07e8ca52a1d1bca1d992d4b8422ad060099f621afe4435c4979f17c6f8b1fac5c6c60477bc9bd0b6bea345aae6fb3820890519adf698c297f31953 +SHA512 (rspec-support-3.13.2.gem) = bf287156bc659f0f1c0198a4c1af577b01693484fca99c8a6bd6703da87cd021772bf18a02e886d29435a3793165cc7d5de3b485031aacf33b2cdd97b9669bbe +SHA512 (rubygem-rspec-support-3.13.2-full.tar.gz) = be39887bc7b5ece60f3c811c0002a1d92fb31dcfdfcd38c3e937e551591834f79094ceef31c2104bc7a6735112b052c958ccced9b2e9a70810e41bcf9907eeda From dee9454779dec40989edf0f5e38c9689ec98819c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 29 Dec 2024 11:06:01 +0900 Subject: [PATCH 66/72] Backport upstream fix to support ruby34 Hash inspect syntax --- ...pec-support-pr164-ruby34-hash-syntax.patch | 91 +++++++++++++++++++ rubygem-rspec-support.spec | 9 +- 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 rubygem-rspec-support-pr164-ruby34-hash-syntax.patch diff --git a/rubygem-rspec-support-pr164-ruby34-hash-syntax.patch b/rubygem-rspec-support-pr164-ruby34-hash-syntax.patch new file mode 100644 index 0000000..3f54d0a --- /dev/null +++ b/rubygem-rspec-support-pr164-ruby34-hash-syntax.patch @@ -0,0 +1,91 @@ +From 9310b4b72e205c6352c4b30015a3b8f3d2fb02e8 Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Thu, 26 Dec 2024 11:06:37 +0000 +Subject: [PATCH 1/2] Format hashes in new {a: :b} format on Ruby 3.4 + +--- + .../step_definitions/additional_cli_steps.rb | 2 +- + .../rspec/mocks/argument_matchers_spec.rb | 24 ++++++++++++++++--- + rspec-mocks/spec/rspec/mocks/diffing_spec.rb | 17 +++++-------- + rspec-mocks/spec/rspec/mocks/double_spec.rb | 2 +- + .../spec/rspec/mocks/matchers/receive_spec.rb | 4 ++-- + .../expected_arg_verification_spec.rb | 2 +- + .../lib/rspec/support/object_formatter.rb | 2 ++ + .../spec/rspec/support/differ_spec.rb | 2 +- + .../rspec/support/object_formatter_spec.rb | 22 +++++++++++++++-- + 9 files changed, 55 insertions(+), 22 deletions(-) + +diff --git a/rspec-support/lib/rspec/support/object_formatter.rb b/rspec-support/lib/rspec/support/object_formatter.rb +index a3d5a11cb..d464f1b3c 100644 +--- a/rspec-support/lib/rspec/support/object_formatter.rb ++++ b/rspec-support/lib/rspec/support/object_formatter.rb +@@ -61,6 +61,8 @@ def prepare_for_inspection(object) + prepare_array(object) + when Hash + prepare_hash(object) ++ when Symbol ++ object + else + inspector_class = INSPECTOR_CLASSES.find { |inspector| inspector.can_inspect?(object) } + inspector_class.new(object, self) +diff --git a/rspec-support/spec/rspec/support/differ_spec.rb b/rspec-support/spec/rspec/support/differ_spec.rb +index bcfd9744a..18f6aefc4 100644 +--- a/rspec-support/spec/rspec/support/differ_spec.rb ++++ b/rspec-support/spec/rspec/support/differ_spec.rb +@@ -308,7 +308,7 @@ def inspect; ""; end + | + EOD + +- expected_diff.gsub!('=>',' => ') if RUBY_VERSION.to_f > 3.3 ++ expected_diff.gsub!(/:(\w+)=>/,'\1: ') if RUBY_VERSION.to_f > 3.3 + + diff = differ.diff(expected,actual) + expect(diff).to be_diffed_as(expected_diff) +diff --git a/rspec-support/spec/rspec/support/object_formatter_spec.rb b/rspec-support/spec/rspec/support/object_formatter_spec.rb +index 68c48a549..3bbe20390 100644 +--- a/rspec-support/spec/rspec/support/object_formatter_spec.rb ++++ b/rspec-support/spec/rspec/support/object_formatter_spec.rb +@@ -17,6 +17,19 @@ module Support + end + end + ++ context "with an array containing a hash", :aggregate_failures do ++ it "formats the output the same as if it was inspected" do ++ formatted = ObjectFormatter.format([{ :a => :b }]) ++ expect(formatted).to eq( ++ if RUBY_VERSION.to_f > 3.3 ++ "[{a: :b}]" ++ else ++ "[{:a=>:b}]" ++ end ++ ) ++ end ++ end ++ + context "with a hash object containing other objects for which we have custom formatting" do + let(:time) { Time.utc(1969, 12, 31, 19, 01, 40, 101) } + let(:formatted_time) { ObjectFormatter.format(time) } +@@ -37,7 +50,12 @@ module Support + unless RUBY_VERSION == '1.8.7' # We can't count on the ordering of the hash on 1.8.7... + context 'with a hash object' do + let(:input) { { :c => "ccc", :a => "aaa", "b" => 'bbb' } } +- let(:expected) { '{:a=>"aaa", "b"=>"bbb", :c=>"ccc"}' } ++ ++ if RUBY_VERSION.to_f > 3.3 ++ let(:expected) { '{a: "aaa", "b"=>"bbb", c: "ccc"}' } ++ else ++ let(:expected) { '{:a=>"aaa", "b"=>"bbb", :c=>"ccc"}' } ++ end + + it 'sorts keys to ensure objects are always displayed the same way' do + formatted = ObjectFormatter.format(input) +@@ -375,7 +393,7 @@ def inspect + + if RUBY_VERSION.to_f > 3.3 + def eq_hash_syntax(string) +- eq string.gsub('=>', ' => ') ++ eq string.gsub(/:(\w+)=>/, '\1: ').gsub('=>', ' => ') + end + else + def eq_hash_syntax(string) + diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 9e91c25..dfdb10a 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.13.2 %undefine prever -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -22,6 +22,9 @@ 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 +# https://github.com/rspec/rspec/pull/164 +# Support ruby34 Hash#inspect syntax +Patch0: rubygem-rspec-support-pr164-ruby34-hash-syntax.patch Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch #BuildRequires: ruby(release) @@ -58,6 +61,7 @@ Documentation for %{name} %setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%patch -P0 -p2 %patch -P100 -p1 %build @@ -106,6 +110,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Sun Dec 29 2024 Mamoru TASAKA - 3.13.2-2 +- Backport upstream fix to support ruby34 Hash inspect syntax + * Thu Dec 05 2024 Mamoru TASAKA - 3.13.2-1 - 3.13.2 From e8ef9708dc74de8c1b1237e7ea79f6be082361a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:58:29 +0000 Subject: [PATCH 67/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index dfdb10a..fabf5dc 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.13.2 %undefine prever -%global baserelease 2 +%global baserelease 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -110,6 +110,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Dec 29 2024 Mamoru TASAKA - 3.13.2-2 - Backport upstream fix to support ruby34 Hash inspect syntax From 0b4751d6d0eb42365a359833166728c3a27550d0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 May 2025 14:39:15 +0900 Subject: [PATCH 68/72] 3.13.3 --- ...pport-3.13.3-diff_spec-format-revert.patch | 20 ++++ ...pec-support-pr164-ruby34-hash-syntax.patch | 91 ------------------- rubygem-rspec-support.spec | 15 +-- sources | 4 +- 4 files changed, 31 insertions(+), 99 deletions(-) create mode 100644 rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch delete mode 100644 rubygem-rspec-support-pr164-ruby34-hash-syntax.patch diff --git a/rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch b/rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch new file mode 100644 index 0000000..31260cf --- /dev/null +++ b/rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch @@ -0,0 +1,20 @@ +--- 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 @@ + | -Date: Thu, 26 Dec 2024 11:06:37 +0000 -Subject: [PATCH 1/2] Format hashes in new {a: :b} format on Ruby 3.4 - ---- - .../step_definitions/additional_cli_steps.rb | 2 +- - .../rspec/mocks/argument_matchers_spec.rb | 24 ++++++++++++++++--- - rspec-mocks/spec/rspec/mocks/diffing_spec.rb | 17 +++++-------- - rspec-mocks/spec/rspec/mocks/double_spec.rb | 2 +- - .../spec/rspec/mocks/matchers/receive_spec.rb | 4 ++-- - .../expected_arg_verification_spec.rb | 2 +- - .../lib/rspec/support/object_formatter.rb | 2 ++ - .../spec/rspec/support/differ_spec.rb | 2 +- - .../rspec/support/object_formatter_spec.rb | 22 +++++++++++++++-- - 9 files changed, 55 insertions(+), 22 deletions(-) - -diff --git a/rspec-support/lib/rspec/support/object_formatter.rb b/rspec-support/lib/rspec/support/object_formatter.rb -index a3d5a11cb..d464f1b3c 100644 ---- a/rspec-support/lib/rspec/support/object_formatter.rb -+++ b/rspec-support/lib/rspec/support/object_formatter.rb -@@ -61,6 +61,8 @@ def prepare_for_inspection(object) - prepare_array(object) - when Hash - prepare_hash(object) -+ when Symbol -+ object - else - inspector_class = INSPECTOR_CLASSES.find { |inspector| inspector.can_inspect?(object) } - inspector_class.new(object, self) -diff --git a/rspec-support/spec/rspec/support/differ_spec.rb b/rspec-support/spec/rspec/support/differ_spec.rb -index bcfd9744a..18f6aefc4 100644 ---- a/rspec-support/spec/rspec/support/differ_spec.rb -+++ b/rspec-support/spec/rspec/support/differ_spec.rb -@@ -308,7 +308,7 @@ def inspect; ""; end - | - EOD - -- expected_diff.gsub!('=>',' => ') if RUBY_VERSION.to_f > 3.3 -+ expected_diff.gsub!(/:(\w+)=>/,'\1: ') if RUBY_VERSION.to_f > 3.3 - - diff = differ.diff(expected,actual) - expect(diff).to be_diffed_as(expected_diff) -diff --git a/rspec-support/spec/rspec/support/object_formatter_spec.rb b/rspec-support/spec/rspec/support/object_formatter_spec.rb -index 68c48a549..3bbe20390 100644 ---- a/rspec-support/spec/rspec/support/object_formatter_spec.rb -+++ b/rspec-support/spec/rspec/support/object_formatter_spec.rb -@@ -17,6 +17,19 @@ module Support - end - end - -+ context "with an array containing a hash", :aggregate_failures do -+ it "formats the output the same as if it was inspected" do -+ formatted = ObjectFormatter.format([{ :a => :b }]) -+ expect(formatted).to eq( -+ if RUBY_VERSION.to_f > 3.3 -+ "[{a: :b}]" -+ else -+ "[{:a=>:b}]" -+ end -+ ) -+ end -+ end -+ - context "with a hash object containing other objects for which we have custom formatting" do - let(:time) { Time.utc(1969, 12, 31, 19, 01, 40, 101) } - let(:formatted_time) { ObjectFormatter.format(time) } -@@ -37,7 +50,12 @@ module Support - unless RUBY_VERSION == '1.8.7' # We can't count on the ordering of the hash on 1.8.7... - context 'with a hash object' do - let(:input) { { :c => "ccc", :a => "aaa", "b" => 'bbb' } } -- let(:expected) { '{:a=>"aaa", "b"=>"bbb", :c=>"ccc"}' } -+ -+ if RUBY_VERSION.to_f > 3.3 -+ let(:expected) { '{a: "aaa", "b"=>"bbb", c: "ccc"}' } -+ else -+ let(:expected) { '{:a=>"aaa", "b"=>"bbb", :c=>"ccc"}' } -+ end - - it 'sorts keys to ensure objects are always displayed the same way' do - formatted = ObjectFormatter.format(input) -@@ -375,7 +393,7 @@ def inspect - - if RUBY_VERSION.to_f > 3.3 - def eq_hash_syntax(string) -- eq string.gsub('=>', ' => ') -+ eq string.gsub(/:(\w+)=>/, '\1: ').gsub('=>', ' => ') - end - else - def eq_hash_syntax(string) - diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index fabf5dc..d5e22ca 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,9 +1,9 @@ %global gem_name rspec-support -%global mainver 3.13.2 +%global mainver 3.13.3 %undefine prever -%global baserelease 3 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -22,9 +22,9 @@ 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 -# https://github.com/rspec/rspec/pull/164 -# Support ruby34 Hash#inspect syntax -Patch0: rubygem-rspec-support-pr164-ruby34-hash-syntax.patch +# 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 Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch #BuildRequires: ruby(release) @@ -61,7 +61,7 @@ Documentation for %{name} %setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch -P0 -p2 +%patch -P0 -p1 %patch -P100 -p1 %build @@ -110,6 +110,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Thu May 15 2025 Mamoru TASAKA - 3.13.3-1 +- 3.13.3 + * Sat Jan 18 2025 Fedora Release Engineering - 3.13.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index e66cc32..27a9277 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.13.2.gem) = bf287156bc659f0f1c0198a4c1af577b01693484fca99c8a6bd6703da87cd021772bf18a02e886d29435a3793165cc7d5de3b485031aacf33b2cdd97b9669bbe -SHA512 (rubygem-rspec-support-3.13.2-full.tar.gz) = be39887bc7b5ece60f3c811c0002a1d92fb31dcfdfcd38c3e937e551591834f79094ceef31c2104bc7a6735112b052c958ccced9b2e9a70810e41bcf9907eeda +SHA512 (rspec-support-3.13.3.gem) = 11329d7ad20d9b77d27c102f1c4e9225ad445c4f9e647b690b36364c67534e48f5f7fde8e7b535549e5fd18829ddbe3a1c99b4c33bdd77474a5c3e179d226f5e +SHA512 (rubygem-rspec-support-3.13.3-full.tar.gz) = cfcd9a6e53e77e09a33ba3d6587862a3a5f88938de3187b48e1a55ca1afbce7f4400000343609418f43da3b69321b7dc3a90aadfc25f5486e2fc3f75dd3681eb From c7ab3db585772bc1ad19522ce692873fec81842d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 May 2025 17:32:28 +0900 Subject: [PATCH 69/72] 3.13.4 --- rubygem-rspec-support.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index d5e22ca..52bf5af 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.13.3 +%global mainver 3.13.4 %undefine prever %global baserelease 1 @@ -17,7 +17,7 @@ Release: %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}%{?dist} Summary: Common functionality to Rspec series # SPDX confirmed License: MIT -URL: https://github.com/rspec/rspec-support +URL: https://rspec.info Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz @@ -110,6 +110,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Thu May 29 2025 Mamoru TASAKA - 3.13.4-1 +- 3.13.4 + * Thu May 15 2025 Mamoru TASAKA - 3.13.3-1 - 3.13.3 diff --git a/sources b/sources index 27a9277..259eb21 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.13.3.gem) = 11329d7ad20d9b77d27c102f1c4e9225ad445c4f9e647b690b36364c67534e48f5f7fde8e7b535549e5fd18829ddbe3a1c99b4c33bdd77474a5c3e179d226f5e -SHA512 (rubygem-rspec-support-3.13.3-full.tar.gz) = cfcd9a6e53e77e09a33ba3d6587862a3a5f88938de3187b48e1a55ca1afbce7f4400000343609418f43da3b69321b7dc3a90aadfc25f5486e2fc3f75dd3681eb +SHA512 (rspec-support-3.13.4.gem) = 74c50001b402f2ea43a0df06d1f072b69e516d18a8894a29508b26f17df2773211bcf4a8aaaedec5ccfa57fd114ccae8f6b94a699759e36707b646fd400c88b1 +SHA512 (rubygem-rspec-support-3.13.4-full.tar.gz) = 64cd5051899c0d482442b31144d9ccd83e716b01afc05fb452eaa6c7e8060753bcee3b22740b77e616771312d367c80898279bb63021638f33f08d7151641df3 From 15b63302dbc74e815256712160ae2a8ad2027e86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:46:00 +0000 Subject: [PATCH 70/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-rspec-support.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 52bf5af..3e54678 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -3,7 +3,7 @@ %global mainver 3.13.4 %undefine prever -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -110,6 +110,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.13.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 29 2025 Mamoru TASAKA - 3.13.4-1 - 3.13.4 From d6a2f5797c29a65eed6c0fff2fa6b917a9623970 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 19 Aug 2025 19:59:37 +0900 Subject: [PATCH 71/72] 3.13.5 --- rubygem-rspec-support.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 3e54678..e421aae 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,9 +1,9 @@ %global gem_name rspec-support -%global mainver 3.13.4 +%global mainver 3.13.5 %undefine prever -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %bcond_with bootstrap @@ -110,6 +110,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Tue Aug 19 2025 Mamoru TASAKA - 3.13.5-1 +- 3.13.5 + * Fri Jul 25 2025 Fedora Release Engineering - 3.13.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 259eb21..e4153a9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.13.4.gem) = 74c50001b402f2ea43a0df06d1f072b69e516d18a8894a29508b26f17df2773211bcf4a8aaaedec5ccfa57fd114ccae8f6b94a699759e36707b646fd400c88b1 -SHA512 (rubygem-rspec-support-3.13.4-full.tar.gz) = 64cd5051899c0d482442b31144d9ccd83e716b01afc05fb452eaa6c7e8060753bcee3b22740b77e616771312d367c80898279bb63021638f33f08d7151641df3 +SHA512 (rspec-support-3.13.5.gem) = 3b904f881fe841b0e34640a6f905f69a0eb95bbbbaff1114bed7d7ddf775cbfb69fba09a50d06629e055ddeadcfef7c07eaacbf621d236859f250cfe6fc1b32f +SHA512 (rubygem-rspec-support-3.13.5-full.tar.gz) = a211c8fe5c339eb16727a0cf09367c761b75e14c067858787189a27c1a73fbddda722346fd205973437a993a76b944228660131c74d0e01c17723d2ed52627af From 090bd408465376edb1b31bde84e302f1d2e386ec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Sep 2025 10:55:44 +0900 Subject: [PATCH 72/72] 3.13.6 --- rubygem-rspec-support.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index e421aae..f41bd15 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,6 +1,6 @@ %global gem_name rspec-support -%global mainver 3.13.5 +%global mainver 3.13.6 %undefine prever %global baserelease 1 @@ -110,6 +110,9 @@ rspec spec/ || rspec --tag ~broken %doc %{gem_docdir} %changelog +* Wed Sep 17 2025 Mamoru TASAKA - 3.13.6-1 +- 3.13.6 + * Tue Aug 19 2025 Mamoru TASAKA - 3.13.5-1 - 3.13.5 diff --git a/sources b/sources index e4153a9..3852c20 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.13.5.gem) = 3b904f881fe841b0e34640a6f905f69a0eb95bbbbaff1114bed7d7ddf775cbfb69fba09a50d06629e055ddeadcfef7c07eaacbf621d236859f250cfe6fc1b32f -SHA512 (rubygem-rspec-support-3.13.5-full.tar.gz) = a211c8fe5c339eb16727a0cf09367c761b75e14c067858787189a27c1a73fbddda722346fd205973437a993a76b944228660131c74d0e01c17723d2ed52627af +SHA512 (rubygem-rspec-support-3.13.6-full.tar.gz) = 09387dd39649d47bc3b859251e428808e06b1d2e6bc13d38f2b2da9241e1c937c71992f4b042053729d64af535fd6a6931d73b6d4f454c35eceae037839fa77d +SHA512 (rspec-support-3.13.6.gem) = 7a07e6233e59da5bf9b1347de3e56330b02906cec8d05d619b1ff5f802f98cdf1194e63c01f4a3f5ac0bc68b59794edeaf4dc91cab37b563d57be82543e7df12