From 2fffc6049c3d56bc6f8f0439a472ba8d7e978663 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 09:56:15 -0500 Subject: [PATCH 001/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index d764b18..976a64f 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -17,7 +17,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT @@ -131,6 +131,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.13.1-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Mar 28 2013 Mamoru TASAKA - 2.13.1-2 - Enable test suite again From 61317e25148539ada01bf7df9ba6ef6eb8c655ff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Aug 2013 13:10:21 +0900 Subject: [PATCH 002/126] Bootstrap for rubygem-gherkin <- rubygem-cucumber --- rubygem-rspec-core.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 976a64f..430fe20 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,21 +3,21 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 3 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -131,6 +131,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog +* Tue Aug 6 2013 Mamoru TASAKA - 2.13.1-3 +- Bootstrap for rubygem-gherkin <- rubygem-cucumber + * Sun Aug 04 2013 Fedora Release Engineering - 2.13.1-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a1f538dee800e6464a0ad3cd5e8e65b8ea9bae7f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Aug 2013 14:05:41 +0900 Subject: [PATCH 003/126] Again enable test suite --- rubygem-rspec-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 430fe20..a9e53e3 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -10,14 +10,14 @@ # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT @@ -131,6 +131,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog +* Tue Aug 6 2013 Mamoru TASAKA +- Again enable test suite + * Tue Aug 6 2013 Mamoru TASAKA - 2.13.1-3 - Bootstrap for rubygem-gherkin <- rubygem-cucumber From 3989f5e24c524643b66a994b889975c40da12825 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 16 Aug 2013 00:44:37 +0900 Subject: [PATCH 004/126] 2.14.5 --- .gitignore | 1 + rubygem-rspec-core.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 09fc25d..09f97cc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /rspec-core-2.11.1.gem /rspec-core-2.12.2.gem /rspec-core-2.13.1.gem +/rspec-core-2.14.5.gem diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index a9e53e3..18e1c8e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,16 +1,16 @@ -%global majorver 2.13.1 +%global majorver 2.14.5 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 1 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} @@ -102,6 +102,7 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.treasure_map.rb,.rspec,. %if 0%{?need_bootstrap} < 1 %check +LANG=en_US.UTF-8 pushd .%{gem_instdir} # Test failure needs investigation... # There are is some missing template for Ruby 2.0.0: @@ -131,6 +132,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog +* Fri Aug 16 2013 Mamoru TASAKA - 2.14.5-1 +- 2.14.5 + * Tue Aug 6 2013 Mamoru TASAKA - Again enable test suite diff --git a/sources b/sources index 88e151e..b03de39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -648122b9ca2f7e3df3ca16d930d87668 rspec-core-2.13.1.gem +51638edb7dacc7d89a091da991796f64 rspec-core-2.14.5.gem From 90507dc96810cd463cf3dc4824f5afd0ac281b2e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 16 Aug 2013 01:04:04 +0900 Subject: [PATCH 005/126] Enable test suite again --- rubygem-rspec-core.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 18e1c8e..9533173 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,21 +3,21 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -132,6 +132,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog +* Fri Aug 16 2013 Mamoru TASAKA - 2.14.5-2 +- Enable test suite again + * Fri Aug 16 2013 Mamoru TASAKA - 2.14.5-1 - 2.14.5 From 0a0074b07c2c2295d2d09d2222a3167578dc472a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 24 Oct 2013 17:37:41 +0900 Subject: [PATCH 006/126] 2.14.6 --- .gitignore | 1 + rubygem-rspec-core.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 09f97cc..65e13de 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /rspec-core-2.12.2.gem /rspec-core-2.13.1.gem /rspec-core-2.14.5.gem +/rspec-core-2.14.6.gem diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 9533173..990c916 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 2.14.5 +%global majorver 2.14.6 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -132,10 +132,13 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog -* Fri Aug 16 2013 Mamoru TASAKA - 2.14.5-2 +* Thu Oct 24 2013 Mamoru TASAKA - 2.14.6-1 +- 2.14.6 + +* Fri Aug 16 2013 Mamoru TASAKA - 2.14.5-2 - Enable test suite again -* Fri Aug 16 2013 Mamoru TASAKA - 2.14.5-1 +* Fri Aug 16 2013 Mamoru TASAKA - 2.14.5-1 - 2.14.5 * Tue Aug 6 2013 Mamoru TASAKA diff --git a/sources b/sources index b03de39..ce5b100 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51638edb7dacc7d89a091da991796f64 rspec-core-2.14.5.gem +304b9d5312fca2a114d59f36807a7e7d rspec-core-2.14.6.gem From bd4de696c551e88bb4602681aafbfb509fe01a41 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 11 Nov 2013 12:49:22 +0900 Subject: [PATCH 007/126] 2.14.7 --- .gitignore | 1 + rubygem-rspec-core.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 65e13de..555cdd1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /rspec-core-2.13.1.gem /rspec-core-2.14.5.gem /rspec-core-2.14.6.gem +/rspec-core-2.14.7.gem diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 990c916..8520d58 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 2.14.6 +%global majorver 2.14.7 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -132,6 +132,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog +* Mon Nov 11 2013 Mamoru TASAKA - 2.14.7-1 +- 2.14.7 + * Thu Oct 24 2013 Mamoru TASAKA - 2.14.6-1 - 2.14.6 diff --git a/sources b/sources index ce5b100..43fb15c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -304b9d5312fca2a114d59f36807a7e7d rspec-core-2.14.6.gem +09196e82632b75173790bcde164e6900 rspec-core-2.14.7.gem From 58105f22f0c43cc5154325df2c3c3352c6729a8c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 6 Mar 2014 13:07:50 +0900 Subject: [PATCH 008/126] 2.14.8 --- .gitignore | 1 + rubygem-rspec-core.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 555cdd1..a0e7697 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /rspec-core-2.14.5.gem /rspec-core-2.14.6.gem /rspec-core-2.14.7.gem +/rspec-core-2.14.8.gem diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 8520d58..2e894b0 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 2.14.7 +%global majorver 2.14.8 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -132,6 +132,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog +* Thu Mar 6 2014 Mamoru TASAKA - 2.14.8-1 +- 2.14.8 + * Mon Nov 11 2013 Mamoru TASAKA - 2.14.7-1 - 2.14.7 diff --git a/sources b/sources index 43fb15c..ce02c43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09196e82632b75173790bcde164e6900 rspec-core-2.14.7.gem +70fbddcf0ab469b332a028ccc6565a33 rspec-core-2.14.8.gem From 9b84f31a26930774cc057092918c764d369b7d2b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:15:25 -0500 Subject: [PATCH 009/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 2e894b0..eb757b0 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -17,7 +17,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT @@ -132,6 +132,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %exclude %{gem_instdir}/spec/ %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.14.8-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Mar 6 2014 Mamoru TASAKA - 2.14.8-1 - 2.14.8 From 5ad16a76982bacd73d73c2e91be759669d8aef4d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Nov 2014 16:37:38 +0900 Subject: [PATCH 010/126] 3.1.7 - Once disable tests --- .gitignore | 2 + rubygem-rspec-core.spec | 107 ++++++++++++++++++++-------------------- sources | 3 +- 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index a0e7697..07651b2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ /rspec-core-2.14.6.gem /rspec-core-2.14.7.gem /rspec-core-2.14.8.gem +/rspec-core-3.1.7.gem +/rubygem-rspec-core-3.1.7-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index eb757b0..1cb653c 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 2.14.8 +%global majorver 3.1.7 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -7,48 +7,44 @@ %global gem_name rspec-core - # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 - -%{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} +%global need_bootstrap_set 1 Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT URL: http://github.com/rspec/rspec-mocks Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem +# %%{SOURCE2} %%{name} %%{version} +Source1: rubygem-%{gem_name}-%{version}-full.tar.gz +Source2: rspec-related-create-full-tarball.sh BuildRequires: ruby(release) BuildRequires: rubygems-devel -%if 0%{?need_bootstrap} < 1 -BuildRequires: rubygem(ZenTest) +%if 0%{?need_bootstrap_set} < 1 +BuildRequires: rubygem(minitest) BuildRequires: rubygem(nokogiri) BuildRequires: rubygem(rake) -BuildRequires: rubygem(rspec-expectations) -BuildRequires: rubygem(rspec-mocks) +BuildRequires: rubygem(rspec) BuildRequires: rubygem(aruba) +# Newly +BuildRequires: rubygem(flexmock) +BuildRequires: rubygem(mocha) +BuildRequires: rubygem(rr) %endif -Requires: ruby(release) -# When killing the below dependency, a notification to mailing list -# is needed -#Requires: rubygem(rspec-expectations) -#Requires: rubygem(rspec-mocks) # Make the following installed by default # lib/rspec/core/rake_task Requires: rubygem(rake) # Optional #Requires: rubygem(ZenTest) +#Requires: rubygem(flexmock) #Requires: rubygem(mocha) -#Requires: rubygem(ruby-debug) -# Not found in Fedora yet (and optional) #Requires: rubygem(rr) -Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch %description @@ -64,60 +60,58 @@ This package contains documentation for %{name}. %prep -%setup -q -c -T - -TOPDIR=$(pwd) -mkdir tmpunpackdir -pushd tmpunpackdir - gem unpack %{SOURCE0} -cd %{gem_name}-%{version} -# rpmlint -grep -rl '^#![ \t]*/usr/bin' ./lib| \ - xargs sed -i -e '\@^#![ \t]*/usr/bin@d' +%setup -q -D -T -n %{gem_name}-%{version} -a 1 -gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec -gem build %{gem_name}.gemspec -mv %{gem_name}-%{version}.gem $TOPDIR - -popd -rm -rf tmpunpackdir +gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build +gem build %{gem_name}.gemspec %gem_install -#chmod 0644 ./%{gem_cache} - %install mkdir -p %{buildroot}%{_prefix} cp -a .%{_prefix}/* %{buildroot}%{_prefix}/ -# Rename autospec to avoid conflict with rspec 1.3 -# (anyway this script doesn't seem to be useful) -mv %{buildroot}%{_bindir}/autospec{,2} - # cleanups -rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.treasure_map.rb,.rspec,.travis.yml,spec.txt,.yardopts} +rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} -%if 0%{?need_bootstrap} < 1 +%if 0%{?need_bootstrap_set} < 1 %check LANG=en_US.UTF-8 -pushd .%{gem_instdir} +pushd %{gem_name}-%{version} # Test failure needs investigation... -# There are is some missing template for Ruby 2.0.0: -# https://github.com/rspec/rspec-core/commits/master/spec/rspec/core/formatters/html_formatted-2.0.0.html -ruby -rubygems -Ilib/ -S exe/rspec || : +# perhaps due to some incompatibility between libxml2 2.9.x +# and rubygem-nokogiri + +FAILFILE=() +FAILTEST=() +FAILFILE+=("spec/rspec/core/formatters/html_formatter_spec.rb") +FAILTEST+=("is identical to the one we designed manually") +FAILFILE+=("spec/rspec/core/formatters/progress_formatter_spec.rb") +FAILTEST+=("produces the expected full output") +FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb") +FAILTEST+=("produces the expected full output") + +for ((i = 0; i < ${#FAILFILE[@]}; i++)) { + sed -i \ + -e "\@${FAILTEST[$i]}@s|do|, :broken => true do|" \ + ${FAILFILE[$i]} +} + +ruby -rubygems -Ilib/ -S exe/rspec || \ + ruby -rubygems -Ilib/ -S exe/rspec --tag ~broken + +popd %endif %files -%defattr(-,root,root,-) %dir %{gem_instdir} -%doc %{gem_instdir}/License.txt +%license %{gem_instdir}/License.txt %doc %{gem_instdir}/*.md -%{_bindir}/autospec2 %{_bindir}/rspec %{gem_instdir}/exe/ %{gem_instdir}/lib/ @@ -126,12 +120,19 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %{gem_spec} %files doc -%defattr(-,root,root,-) %{gem_docdir} -%{gem_instdir}/features/ -%exclude %{gem_instdir}/spec/ %changelog +* Mon Nov 10 2014 Mamoru TASAKA - 3.1.7-1 +- 3.1.7 +- Once disable tests + +* Fri Aug 15 2014 Mamoru TASAKA - 3.0.4-1 +- 3.0.4 + +* Fri Aug 15 2014 Mamoru TASAKA - 3.0.3-1 +- 3.0.3 + * Sun Jun 08 2014 Fedora Release Engineering - 2.14.8-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -185,7 +186,7 @@ ruby -rubygems -Ilib/ -S exe/rspec || : * Sat Jul 21 2012 Fedora Release Engineering - 2.8.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Sun Jan 21 2012 Mamoru Tasaka - 2.8.0-1 +* Sun Jan 22 2012 Mamoru Tasaka - 2.8.0-1 - 2.8.0 * Sat Jan 14 2012 Fedora Release Engineering - 2.6.4-1.1 diff --git a/sources b/sources index ce02c43..1ed4dff 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -70fbddcf0ab469b332a028ccc6565a33 rspec-core-2.14.8.gem +17f466dcfbd5a8cebedd1d450555ebb8 rspec-core-3.1.7.gem +452a6620df46e75ca2beb7d103942173 rubygem-rspec-core-3.1.7-full.tar.gz From 978a1b962021d910ef568f44bd0d4fb71f060f3d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Nov 2014 16:43:38 +0900 Subject: [PATCH 011/126] add missing script --- rspec-related-create-full-tarball.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 rspec-related-create-full-tarball.sh diff --git a/rspec-related-create-full-tarball.sh b/rspec-related-create-full-tarball.sh new file mode 100644 index 0000000..a847c6c --- /dev/null +++ b/rspec-related-create-full-tarball.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +if [ $# -lt 2 ] +then + echo "$0 " + exit 1 +fi + +set -x +set -e + +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 + +ln -sf $1 $1-$2 +tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./ + +popd + +rm -rf $TMPDIRPATH From 91bcda18242d261f87dc5336ef3cf2082def9c36 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Nov 2014 17:43:44 +0900 Subject: [PATCH 012/126] Enable tests --- rubygem-rspec-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 1cb653c..05d9be1 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,13 +3,13 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} @@ -123,6 +123,9 @@ popd %{gem_docdir} %changelog +* Mon Nov 10 2014 Mamoru TASAKA - 3.1.7-2 +- Enable tests + * Mon Nov 10 2014 Mamoru TASAKA - 3.1.7-1 - 3.1.7 - Once disable tests From a5ad53c46ab01781ed63f4eca1088ca2693b5032 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Nov 2014 21:14:05 +0900 Subject: [PATCH 013/126] disable more tests --- rubygem-rspec-core.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 05d9be1..582ce72 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -93,6 +93,11 @@ FAILFILE+=("spec/rspec/core/formatters/progress_formatter_spec.rb") FAILTEST+=("produces the expected full output") FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb") FAILTEST+=("produces the expected full output") +# NET?? +FAILFILE+=("spec/rspec/core/runner_spec.rb") +FAILTEST+=("if drb server is started with 127.0.0.1") +FAILFILE+=("spec/rspec/core/runner_spec.rb") +FAILTEST+=("if drb server is started with localhost") for ((i = 0; i < ${#FAILFILE[@]}; i++)) { sed -i \ From 1ee8c776e3eca78a6cafcc198b76419199febd7b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 9 Feb 2015 09:44:13 +0900 Subject: [PATCH 014/126] 3.2.0 - Once disable tests --- .gitignore | 2 ++ rubygem-rspec-core.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 07651b2..a8ff0e9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /rspec-core-2.14.8.gem /rspec-core-3.1.7.gem /rubygem-rspec-core-3.1.7-full.tar.gz +/rspec-core-3.2.0.gem +/rubygem-rspec-core-3.2.0-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 582ce72..5179929 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,15 +1,15 @@ -%global majorver 3.1.7 +%global majorver 3.2.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} @@ -128,6 +128,10 @@ popd %{gem_docdir} %changelog +* Mon Feb 9 2015 Mamoru TASAKA - 3.2.0-1 +- 3.2.0 +- Once disable tests + * Mon Nov 10 2014 Mamoru TASAKA - 3.1.7-2 - Enable tests diff --git a/sources b/sources index 1ed4dff..4fdbbb5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -17f466dcfbd5a8cebedd1d450555ebb8 rspec-core-3.1.7.gem -452a6620df46e75ca2beb7d103942173 rubygem-rspec-core-3.1.7-full.tar.gz +b854c91895afc83b685c8c5e32ff3276 rspec-core-3.2.0.gem +d28c5c8195ce4d00c5a1b98e1e87cd28 rubygem-rspec-core-3.2.0-full.tar.gz From d0da392e3f678b03c07be820c96ab1d2151f24db Mon Sep 17 00:00:00 2001 From: John Date: Mon, 9 Feb 2015 11:25:40 +0900 Subject: [PATCH 015/126] Enable tests again --- rubygem-rspec-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 5179929..b11b0b4 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,13 +3,13 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} @@ -128,6 +128,9 @@ popd %{gem_docdir} %changelog +* Mon Feb 9 2015 Mamoru TASAKA - 3.2.0-2 +- Enable tests again + * Mon Feb 9 2015 Mamoru TASAKA - 3.2.0-1 - 3.2.0 - Once disable tests From 3d47d1bdf6331c4655eb53d4dff10d9b5ff2202f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Feb 2015 15:37:03 +0900 Subject: [PATCH 016/126] 3.2.1 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a8ff0e9..e7563d6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /rubygem-rspec-core-3.1.7-full.tar.gz /rspec-core-3.2.0.gem /rubygem-rspec-core-3.2.0-full.tar.gz +/rspec-core-3.2.1.gem +/rubygem-rspec-core-3.2.1-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index b11b0b4..365f537 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.2.0 +%global majorver 3.2.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -128,6 +128,9 @@ popd %{gem_docdir} %changelog +* Wed Feb 25 2015 Mamoru TASAKA - 3.2.1-1 +- 3.2.1 + * Mon Feb 9 2015 Mamoru TASAKA - 3.2.0-2 - Enable tests again diff --git a/sources b/sources index 4fdbbb5..437929b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b854c91895afc83b685c8c5e32ff3276 rspec-core-3.2.0.gem -d28c5c8195ce4d00c5a1b98e1e87cd28 rubygem-rspec-core-3.2.0-full.tar.gz +eed8f93aebe3e4684f1004d717a3f9ed rspec-core-3.2.1.gem +240b2eadd0752fa14baa7e571cb4f31f rubygem-rspec-core-3.2.1-full.tar.gz From db5e1262dd7af50e20cc0448ac027a875dc8d98c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 12 Mar 2015 17:19:56 +0900 Subject: [PATCH 017/126] 3.2.2 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e7563d6..7b72c90 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /rubygem-rspec-core-3.2.0-full.tar.gz /rspec-core-3.2.1.gem /rubygem-rspec-core-3.2.1-full.tar.gz +/rspec-core-3.2.2.gem +/rubygem-rspec-core-3.2.2-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 365f537..1056805 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.2.1 +%global majorver 3.2.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -128,6 +128,9 @@ popd %{gem_docdir} %changelog +* Thu Mar 12 2015 Mamoru TASAKA - 3.2.2-1 +- 3.2.2 + * Wed Feb 25 2015 Mamoru TASAKA - 3.2.1-1 - 3.2.1 diff --git a/sources b/sources index 437929b..5697990 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -eed8f93aebe3e4684f1004d717a3f9ed rspec-core-3.2.1.gem -240b2eadd0752fa14baa7e571cb4f31f rubygem-rspec-core-3.2.1-full.tar.gz +b3690b881f402b4692801a35d422cd6d rspec-core-3.2.2.gem +61e5cb3de2d0e86a38ba86051cf4814c rubygem-rspec-core-3.2.2-full.tar.gz From 3d0412e2db10a99cc0c6348e27efc287bbab8e27 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Apr 2015 16:02:03 +0900 Subject: [PATCH 018/126] 3.2.3 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7b72c90..5d93c04 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /rubygem-rspec-core-3.2.1-full.tar.gz /rspec-core-3.2.2.gem /rubygem-rspec-core-3.2.2-full.tar.gz +/rspec-core-3.2.3.gem +/rubygem-rspec-core-3.2.3-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 1056805..cb88c5d 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.2.2 +%global majorver 3.2.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -128,6 +128,9 @@ popd %{gem_docdir} %changelog +* Wed Apr 8 2015 Mamoru TASAKA - 3.2.3-1 +- 3.2.3 + * Thu Mar 12 2015 Mamoru TASAKA - 3.2.2-1 - 3.2.2 diff --git a/sources b/sources index 5697990..70870e4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b3690b881f402b4692801a35d422cd6d rspec-core-3.2.2.gem -61e5cb3de2d0e86a38ba86051cf4814c rubygem-rspec-core-3.2.2-full.tar.gz +c59d70126c220320c34b827c6c1d8b75 rspec-core-3.2.3.gem +bc9b4bc6aba8935d20348fc91e8831a3 rubygem-rspec-core-3.2.3-full.tar.gz From af27ce19f3d1ead8acdd0c9c162a54efe2011fc6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 23:48:21 +0000 Subject: [PATCH 019/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index cb88c5d..563d07e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -14,7 +14,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT @@ -128,6 +128,9 @@ popd %{gem_docdir} %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 3.2.3-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Apr 8 2015 Mamoru TASAKA - 3.2.3-1 - 3.2.3 From d1847bb23086e4533d03fd5489ffde3e151ff590 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 2 Aug 2015 16:20:02 +0900 Subject: [PATCH 020/126] 3.3.2 - Once disable tests --- .gitignore | 2 ++ rubygem-rspec-core.spec | 27 ++++++++++++++++++++++++--- sources | 4 ++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5d93c04..5e5b864 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /rubygem-rspec-core-3.2.2-full.tar.gz /rspec-core-3.2.3.gem /rubygem-rspec-core-3.2.3-full.tar.gz +/rspec-core-3.3.2.gem +/rubygem-rspec-core-3.3.2-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 563d07e..8760fe3 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.2.3 +%global majorver 3.3.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -9,12 +9,12 @@ # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -98,6 +98,9 @@ FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with 127.0.0.1") FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with localhost") +# ??? +FAILFILE+=("spec/rspec/core/configuration_spec.rb ") +FAILTEST+=("does not load files in the default path when run by ruby") for ((i = 0; i < ${#FAILFILE[@]}; i++)) { sed -i \ @@ -105,10 +108,24 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { ${FAILFILE[$i]} } +# FIXME +# thread_order not in Fedora yet +for f in \ + spec/rspec/core/memoized_helpers_spec.rb \ + spec/rspec/core/reentrant_mutex_spec.rb \ + %{nil} +do + mv $f $f.skip + echo > $f +done + ruby -rubygems -Ilib/ -S exe/rspec || \ ruby -rubygems -Ilib/ -S exe/rspec --tag ~broken popd + +find . -name \*.skip | while read f ; do mv $f ${f%.skip} ; done + %endif %files @@ -128,6 +145,10 @@ popd %{gem_docdir} %changelog +* Sun Aug 2 2015 Mamoru TASAKA - 3.3.2-1 +- 3.3.2 +- Once disable tests + * Thu Jun 18 2015 Fedora Release Engineering - 3.2.3-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 70870e4..5eed6af 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c59d70126c220320c34b827c6c1d8b75 rspec-core-3.2.3.gem -bc9b4bc6aba8935d20348fc91e8831a3 rubygem-rspec-core-3.2.3-full.tar.gz +03f610155f426187ecc0d4275d0d56dc rspec-core-3.3.2.gem +0bbd80ac2492aa2a50b67abad817716d rubygem-rspec-core-3.3.2-full.tar.gz From c43ed15eda4b7a7b15cf9ea099109fd7c06bb98d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 2 Aug 2015 20:43:38 +0900 Subject: [PATCH 021/126] Enable tests again --- rubygem-rspec-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 8760fe3..7c54916 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,13 +3,13 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} @@ -145,6 +145,9 @@ find . -name \*.skip | while read f ; do mv $f ${f%.skip} ; done %{gem_docdir} %changelog +* Sun Aug 2 2015 Mamoru TASAKA - 3.3.2-2 +- Enable tests again + * Sun Aug 2 2015 Mamoru TASAKA - 3.3.2-1 - 3.3.2 - Once disable tests From 7676cfd57489effdbc812730d0d8dcfcb4953591 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 2 Aug 2015 21:18:01 +0900 Subject: [PATCH 022/126] BR: git --- rubygem-rspec-core.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 7c54916..85fafab 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -36,6 +36,7 @@ BuildRequires: rubygem(aruba) BuildRequires: rubygem(flexmock) BuildRequires: rubygem(mocha) BuildRequires: rubygem(rr) +BuildRequires: git %endif # Make the following installed by default # lib/rspec/core/rake_task From 4946d928222e0d75614d074d1129d3b8650819a7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 2 Aug 2015 21:52:59 +0900 Subject: [PATCH 023/126] Fix br, sed script --- rubygem-rspec-core.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 85fafab..b155869 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -36,6 +36,7 @@ BuildRequires: rubygem(aruba) BuildRequires: rubygem(flexmock) BuildRequires: rubygem(mocha) BuildRequires: rubygem(rr) +BuildRequires: rubygem(coderay) BuildRequires: git %endif # Make the following installed by default @@ -100,12 +101,12 @@ FAILTEST+=("if drb server is started with 127.0.0.1") FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with localhost") # ??? -FAILFILE+=("spec/rspec/core/configuration_spec.rb ") +FAILFILE+=("spec/rspec/core/configuration_spec.rb") FAILTEST+=("does not load files in the default path when run by ruby") for ((i = 0; i < ${#FAILFILE[@]}; i++)) { sed -i \ - -e "\@${FAILTEST[$i]}@s|do|, :broken => true do|" \ + -e "\@${FAILTEST[$i]}@s|do$|, :broken => true do|" \ ${FAILFILE[$i]} } From 74f764b8b00386e5d197161c3cbbc4f7744ffa62 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Aug 2015 15:59:30 +0900 Subject: [PATCH 024/126] Enable thread_order dependent tests --- rubygem-rspec-core.spec | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index b155869..d154349 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 3 %global gem_name rspec-core @@ -37,6 +37,7 @@ BuildRequires: rubygem(flexmock) BuildRequires: rubygem(mocha) BuildRequires: rubygem(rr) BuildRequires: rubygem(coderay) +BuildRequires: rubygem(thread_order) BuildRequires: git %endif # Make the following installed by default @@ -110,24 +111,11 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { ${FAILFILE[$i]} } -# FIXME -# thread_order not in Fedora yet -for f in \ - spec/rspec/core/memoized_helpers_spec.rb \ - spec/rspec/core/reentrant_mutex_spec.rb \ - %{nil} -do - mv $f $f.skip - echo > $f -done - ruby -rubygems -Ilib/ -S exe/rspec || \ ruby -rubygems -Ilib/ -S exe/rspec --tag ~broken popd -find . -name \*.skip | while read f ; do mv $f ${f%.skip} ; done - %endif %files @@ -147,6 +135,9 @@ find . -name \*.skip | while read f ; do mv $f ${f%.skip} ; done %{gem_docdir} %changelog +* Wed Aug 12 2015 Mamoru TASAKA - 3.3.2-3 +- Enable thread_order dependent tests + * Sun Aug 2 2015 Mamoru TASAKA - 3.3.2-2 - Enable tests again From 59b12b148e49bd6748ef8707bdeb227f4836579b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Dec 2015 16:21:42 +0900 Subject: [PATCH 025/126] 3.4.1 - Once disable tests --- .gitignore | 2 ++ rubygem-rspec-core.spec | 24 +++++++++++++----------- sources | 4 ++-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 5e5b864..1720370 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /rubygem-rspec-core-3.2.3-full.tar.gz /rspec-core-3.3.2.gem /rubygem-rspec-core-3.3.2-full.tar.gz +/rspec-core-3.4.1.gem +/rubygem-rspec-core-3.4.1-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index d154349..e3a4250 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,15 +1,15 @@ -%global majorver 3.3.2 +%global majorver 3.4.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 1 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} @@ -24,7 +24,7 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh -BuildRequires: ruby(release) +#BuildRequires: ruby(release) BuildRequires: rubygems-devel %if 0%{?need_bootstrap_set} < 1 BuildRequires: rubygem(minitest) @@ -90,20 +90,17 @@ pushd %{gem_name}-%{version} FAILFILE=() FAILTEST=() -FAILFILE+=("spec/rspec/core/formatters/html_formatter_spec.rb") -FAILTEST+=("is identical to the one we designed manually") FAILFILE+=("spec/rspec/core/formatters/progress_formatter_spec.rb") FAILTEST+=("produces the expected full output") FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb") FAILTEST+=("produces the expected full output") +FAILFILE+=("spec/rspec/core/source/syntax_highlighter_spec.rb") +FAILTEST+=(""when CodeRay is available) # NET?? FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with 127.0.0.1") FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with localhost") -# ??? -FAILFILE+=("spec/rspec/core/configuration_spec.rb") -FAILTEST+=("does not load files in the default path when run by ruby") for ((i = 0; i < ${#FAILFILE[@]}; i++)) { sed -i \ @@ -121,8 +118,9 @@ popd %files %dir %{gem_instdir} -%license %{gem_instdir}/License.txt -%doc %{gem_instdir}/*.md +%license %{gem_instdir}/LICENSE.md +%doc %{gem_instdir}/Changelog.md +%doc %{gem_instdir}/README.md %{_bindir}/rspec %{gem_instdir}/exe/ @@ -135,6 +133,10 @@ popd %{gem_docdir} %changelog +* Tue Dec 8 2015 Mamoru TASAKA - 3.4.1-1 +- 3.4.1 +- Once disable tests + * Wed Aug 12 2015 Mamoru TASAKA - 3.3.2-3 - Enable thread_order dependent tests diff --git a/sources b/sources index 5eed6af..98a829a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -03f610155f426187ecc0d4275d0d56dc rspec-core-3.3.2.gem -0bbd80ac2492aa2a50b67abad817716d rubygem-rspec-core-3.3.2-full.tar.gz +874c282deb7a806225d5b33eeb94e46c rspec-core-3.4.1.gem +a77953f57e9e51b197df53c27f537207 rubygem-rspec-core-3.4.1-full.tar.gz From 24d99ed1bb6821d43fb456ee12ea3d46ed220bd6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Dec 2015 17:24:11 +0900 Subject: [PATCH 026/126] Enable tests again --- rubygem-rspec-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index e3a4250..36cdcfe 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,13 +3,13 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} @@ -133,6 +133,9 @@ popd %{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 b6a39dc36a1cb987d5f194351f5e7450e1cf82de Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 28 Jan 2016 13:39:17 +0900 Subject: [PATCH 027/126] 3.4.2 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1720370..3e8d513 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /rubygem-rspec-core-3.3.2-full.tar.gz /rspec-core-3.4.1.gem /rubygem-rspec-core-3.4.1-full.tar.gz +/rspec-core-3.4.2.gem +/rubygem-rspec-core-3.4.2-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 36cdcfe..7684317 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.4.1 +%global majorver 3.4.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -133,6 +133,9 @@ popd %{gem_docdir} %changelog +* Thu Jan 28 2016 Mamoru TASAKA - 3.4.2-1 +- 3.4.2 + * Tue Dec 8 2015 Mamoru TASAKA - 3.4.1-2 - Enable tests again diff --git a/sources b/sources index 98a829a..4ec1183 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -874c282deb7a806225d5b33eeb94e46c rspec-core-3.4.1.gem -a77953f57e9e51b197df53c27f537207 rubygem-rspec-core-3.4.1-full.tar.gz +ce53016ec71351b08ff9c7c98538f341 rspec-core-3.4.2.gem +65cb148e05e26a47fd170143ada29ae4 rubygem-rspec-core-3.4.2-full.tar.gz From aa96ba596042d266c3fd29dac2bc8be4786019b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:14:06 +0000 Subject: [PATCH 028/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 7684317..ed7dcf0 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -14,7 +14,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT @@ -133,6 +133,9 @@ popd %{gem_docdir} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 3.4.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 28 2016 Mamoru TASAKA - 3.4.2-1 - 3.4.2 From 986c8b0537582f303c6d7293114007731e99879d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Feb 2016 01:10:00 +0900 Subject: [PATCH 029/126] 3.4.3 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 12 ++++++++++-- sources | 3 +-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e8d513..e941e5f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /rubygem-rspec-core-3.4.1-full.tar.gz /rspec-core-3.4.2.gem /rubygem-rspec-core-3.4.2-full.tar.gz +/rspec-core-3.4.3.gem +/rubygem-rspec-core-3.4.3-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index ed7dcf0..b44775e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.4.2 +%global majorver 3.4.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -14,7 +14,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -39,6 +39,11 @@ BuildRequires: rubygem(rr) BuildRequires: rubygem(coderay) BuildRequires: rubygem(thread_order) BuildRequires: git + +%if 0%{?fedora} >= 24 +BuildRequires: glibc-langpack-en +%endif + %endif # Make the following installed by default # lib/rspec/core/rake_task @@ -133,6 +138,9 @@ popd %{gem_docdir} %changelog +* Sun Feb 28 2016 Mamoru TASAKA - 3.4.3-1 +- 3.4.3 + * Thu Feb 04 2016 Fedora Release Engineering - 3.4.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 4ec1183..58beb47 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ce53016ec71351b08ff9c7c98538f341 rspec-core-3.4.2.gem -65cb148e05e26a47fd170143ada29ae4 rubygem-rspec-core-3.4.2-full.tar.gz +9cdce0f933f3b1ec534e1b0fd8254859 rubygem-rspec-core-3.4.3-full.tar.gz From 61a8355f286a6ba7cb52f81a31f6f747ff6d630b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Feb 2016 01:14:32 +0900 Subject: [PATCH 030/126] register source again --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 58beb47..f5d5e47 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 9cdce0f933f3b1ec534e1b0fd8254859 rubygem-rspec-core-3.4.3-full.tar.gz +cf54ff8ab45baf6311b6a86d1cb6709e rspec-core-3.4.3.gem From 1f4c2cd2208a31f9313e2200b26761f1b79070ba Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Mar 2016 17:55:05 +0900 Subject: [PATCH 031/126] 3.4.4 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 10 +++++++++- sources | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e941e5f..f62214e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ /rubygem-rspec-core-3.4.2-full.tar.gz /rspec-core-3.4.3.gem /rubygem-rspec-core-3.4.3-full.tar.gz +/rspec-core-3.4.4.gem +/rubygem-rspec-core-3.4.4-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index b44775e..77d13d2 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.4.3 +%global majorver 3.4.4 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -10,6 +10,11 @@ # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core %global need_bootstrap_set 0 +%if 0%{?fedora} >= 25 +# Disable test for now due to cucumber v.s. gherkin dependency issue +# pulled by aruba +%global need_bootstrap_set 1 +%endif Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} @@ -138,6 +143,9 @@ popd %{gem_docdir} %changelog +* Mon Mar 14 2016 Mamoru TASAKA - 3.4.4-1 +- 3.4.4 + * Sun Feb 28 2016 Mamoru TASAKA - 3.4.3-1 - 3.4.3 diff --git a/sources b/sources index f5d5e47..f7727b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9cdce0f933f3b1ec534e1b0fd8254859 rubygem-rspec-core-3.4.3-full.tar.gz -cf54ff8ab45baf6311b6a86d1cb6709e rspec-core-3.4.3.gem +fba0b1ddea9c45e353a899b6406f5251 rspec-core-3.4.4.gem +23a11c71e2bef4a1f8874938345583e9 rubygem-rspec-core-3.4.4-full.tar.gz From 8800d85546de33fd12061aef07a6f94cc9cb5e26 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Jul 2016 00:47:10 +0900 Subject: [PATCH 032/126] 3.5.1 - Once disable tests --- .gitignore | 2 ++ rubygem-rspec-core.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f62214e..9b259e4 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ /rubygem-rspec-core-3.4.3-full.tar.gz /rspec-core-3.4.4.gem /rubygem-rspec-core-3.4.4-full.tar.gz +/rspec-core-3.5.1.gem +/rubygem-rspec-core-3.5.1-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 77d13d2..799f02c 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,15 +1,15 @@ -%global majorver 3.4.4 +%global majorver 3.5.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 0.1 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %if 0%{?fedora} >= 25 # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba @@ -143,6 +143,10 @@ popd %{gem_docdir} %changelog +* Sat Jul 23 2016 Mamoru TASAKA - 3.5.1-0.1 +- 3.5.1 +- Once disable tests + * Mon Mar 14 2016 Mamoru TASAKA - 3.4.4-1 - 3.4.4 diff --git a/sources b/sources index f7727b9..8af7575 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -fba0b1ddea9c45e353a899b6406f5251 rspec-core-3.4.4.gem -23a11c71e2bef4a1f8874938345583e9 rubygem-rspec-core-3.4.4-full.tar.gz +773132d4ae1b4a5cda5bfd529e7d458a rspec-core-3.5.1.gem +8208ffdba984c39af55e50cce71c452d rubygem-rspec-core-3.5.1-full.tar.gz From a6ab88c40a19eec398a7f74316f4a1930f592029 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Jul 2016 01:14:28 +0900 Subject: [PATCH 033/126] Enable tests again --- rubygem-rspec-core.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 799f02c..742be42 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,17 +3,17 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 0.1 +%global fedorarel 1 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %if 0%{?fedora} >= 25 # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %endif Summary: Rspec-2 runner and formatters @@ -143,6 +143,9 @@ popd %{gem_docdir} %changelog +* Sun Jul 24 2016 Mamoru TASAKA - 3.5.1-1 +- Enable tests again + * Sat Jul 23 2016 Mamoru TASAKA - 3.5.1-0.1 - 3.5.1 - Once disable tests From 8915e580d548b0b744ced4a7d9cf0d0d3701b0d1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 1 Aug 2016 18:01:01 +0900 Subject: [PATCH 034/126] 3.5.2 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9b259e4..b5dc50a 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ /rubygem-rspec-core-3.4.4-full.tar.gz /rspec-core-3.5.1.gem /rubygem-rspec-core-3.5.1-full.tar.gz +/rspec-core-3.5.2.gem +/rubygem-rspec-core-3.5.2-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 742be42..829b8ad 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.5.1 +%global majorver 3.5.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -143,6 +143,9 @@ popd %{gem_docdir} %changelog +* Mon Aug 1 2016 Mamoru TASAKA - 3.5.2-1 +- 3.5.2 + * Sun Jul 24 2016 Mamoru TASAKA - 3.5.1-1 - Enable tests again diff --git a/sources b/sources index 8af7575..7643a27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -773132d4ae1b4a5cda5bfd529e7d458a rspec-core-3.5.1.gem -8208ffdba984c39af55e50cce71c452d rubygem-rspec-core-3.5.1-full.tar.gz +96db1732bdae19fce7550479b3e4c119 rspec-core-3.5.2.gem +cc4f29fd79917906540bda0ec838b490 rubygem-rspec-core-3.5.2-full.tar.gz From 206b9cb29e65d96bd5e02907c0d446f71fb43fa8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 4 Sep 2016 16:13:32 +0900 Subject: [PATCH 035/126] 3.5.3 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 10 ++++++++-- sources | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b5dc50a..fdb47c7 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ /rubygem-rspec-core-3.5.1-full.tar.gz /rspec-core-3.5.2.gem /rubygem-rspec-core-3.5.2-full.tar.gz +/rspec-core-3.5.3.gem +/rubygem-rspec-core-3.5.3-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 829b8ad..7854dd5 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.5.2 +%global majorver 3.5.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -105,7 +105,10 @@ FAILTEST+=("produces the expected full output") FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb") FAILTEST+=("produces the expected full output") FAILFILE+=("spec/rspec/core/source/syntax_highlighter_spec.rb") -FAILTEST+=(""when CodeRay is available) +FAILTEST+=("when CodeRay is available") +# New from 3.5.3 +FAILFILE+=("spec/integration/suite_hooks_errors_spec.rb") +FAILTEST+=("nicely formats errors") # NET?? FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with 127.0.0.1") @@ -143,6 +146,9 @@ popd %{gem_docdir} %changelog +* Sun Sep 4 2016 Mamoru TASAKA - 3.5.3-1 +- 3.5.3 + * Mon Aug 1 2016 Mamoru TASAKA - 3.5.2-1 - 3.5.2 diff --git a/sources b/sources index 7643a27..7471e39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -96db1732bdae19fce7550479b3e4c119 rspec-core-3.5.2.gem -cc4f29fd79917906540bda0ec838b490 rubygem-rspec-core-3.5.2-full.tar.gz +42800c581e30da80ee9a8c2991a36965 rspec-core-3.5.3.gem +442af3e3f466e80c0a45ebe2abad9ead rubygem-rspec-core-3.5.3-full.tar.gz From 98927e4576cee850dd3caacd8f606cb74e9d1cff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Oct 2016 13:54:20 +0900 Subject: [PATCH 036/126] 3.5.4 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 8 +++++++- sources | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fdb47c7..20304d0 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ /rubygem-rspec-core-3.5.2-full.tar.gz /rspec-core-3.5.3.gem /rubygem-rspec-core-3.5.3-full.tar.gz +/rspec-core-3.5.4.gem +/rubygem-rspec-core-3.5.4-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 7854dd5..bde9321 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.5.3 +%global majorver 3.5.4 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -121,6 +121,9 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { ${FAILFILE[$i]} } +# FIXME +# Currently Fedora has aruba 0.6.2, however with aruba 0.14.0 +# many tests fail. ruby -rubygems -Ilib/ -S exe/rspec || \ ruby -rubygems -Ilib/ -S exe/rspec --tag ~broken @@ -146,6 +149,9 @@ popd %{gem_docdir} %changelog +* Mon Oct 10 2016 Mamoru TASAKA - 3.5.4-1 +- 3.5.4 + * Sun Sep 4 2016 Mamoru TASAKA - 3.5.3-1 - 3.5.3 diff --git a/sources b/sources index 7471e39..f10715f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -42800c581e30da80ee9a8c2991a36965 rspec-core-3.5.3.gem -442af3e3f466e80c0a45ebe2abad9ead rubygem-rspec-core-3.5.3-full.tar.gz +da331ca42abe7036dce4f79ea5dada47 rspec-core-3.5.4.gem +8d275bf3ba4097068e79e4b61d3c9734 rubygem-rspec-core-3.5.4-full.tar.gz From 8d95aca46af0062d4e358de99b279f2009c8095d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 31 Jan 2017 16:44:22 +0100 Subject: [PATCH 037/126] Fix Ruby 2.4 and Aruba 0.14.0 compatibility. --- rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch | 104 ++++++++++++++++++++++ rubygem-rspec-core.spec | 23 ++++- 2 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch diff --git a/rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch b/rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch new file mode 100644 index 0000000..65b7e6c --- /dev/null +++ b/rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch @@ -0,0 +1,104 @@ +From c6b11177fcd951380fa1d267944681bf08044aac Mon Sep 17 00:00:00 2001 +From: Myron Marston +Date: Mon, 26 Dec 2016 10:19:31 -0800 +Subject: [PATCH 1/2] Change example of invalid option to `--foo_bar`. + +`--default_path` seems to be interpretted as `--default-path` +on Ruby 2.4, which is valid. +--- + spec/rspec/core/configuration_options_spec.rb | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/spec/rspec/core/configuration_options_spec.rb b/spec/rspec/core/configuration_options_spec.rb +index f170192..7004bed 100644 +--- a/spec/rspec/core/configuration_options_spec.rb ++++ b/spec/rspec/core/configuration_options_spec.rb +@@ -395,7 +395,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) + expect { + parse_options(*options) + }.to raise_error(SystemExit).and output(a_string_including( +- "invalid option: --default_path (defined in #{source})", ++ "invalid option: --foo_bar (defined in #{source})", + "Please use --help for a listing of valid options" + )).to_stderr + end +@@ -404,7 +404,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) + context "defined in #{file_name}" do + it "mentions the file name in the error so users know where to look for it" do + file_name = File.expand_path(file_name) if file_name.start_with?("~") +- File.open(File.expand_path(file_name), "w") { |f| f << "--default_path" } ++ File.open(File.expand_path(file_name), "w") { |f| f << "--foo_bar" } + expect_parsing_to_fail_mentioning_source(file_name) + end + end +@@ -412,7 +412,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) + + context "defined in SPEC_OPTS" do + it "mentions ENV['SPEC_OPTS'] as the source in the error so users know where to look for it" do +- with_env_vars 'SPEC_OPTS' => "--default_path" do ++ with_env_vars 'SPEC_OPTS' => "--foo_bar" do + expect_parsing_to_fail_mentioning_source("ENV['SPEC_OPTS']") + end + end +@@ -420,7 +420,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) + + context "defined in a custom file" do + it "mentions the custom file as the source of the error so users know where to look for it" do +- File.open("./custom.opts", "w") {|f| f << "--default_path"} ++ File.open("./custom.opts", "w") {|f| f << "--foo_bar"} + + expect_parsing_to_fail_mentioning_source("./custom.opts", %w[-O ./custom.opts]) + end +@@ -428,9 +428,9 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) + context "passed at the command line" do + it "does not mention the source since it is obvious where it came from" do + expect { +- parse_options("--default_path") ++ parse_options("--foo_bar") + }.to raise_error(SystemExit).and output(a_string_including( +- "invalid option: --default_path\n", ++ "invalid option: --foo_bar\n", + "Please use --help for a listing of valid options" + )).to_stderr + end + +From dba6b95888f79ce5a24bf986bfb5d31385f71bb9 Mon Sep 17 00:00:00 2001 +From: Myron Marston +Date: Mon, 26 Dec 2016 10:24:06 -0800 +Subject: [PATCH 2/2] Exclude spec on Ruby 2.4 that fails and is not needed. + +--- + lib/rspec/core/configuration_options.rb | 2 ++ + spec/rspec/core/configuration_options_spec.rb | 4 +++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/rspec/core/configuration_options.rb b/lib/rspec/core/configuration_options.rb +index f46df2f..1b93e8c 100644 +--- a/lib/rspec/core/configuration_options.rb ++++ b/lib/rspec/core/configuration_options.rb +@@ -186,8 +186,10 @@ def local_options_file + def global_options_file + File.join(File.expand_path("~"), ".rspec") + rescue ArgumentError ++ # :nocov: + RSpec.warning "Unable to find ~/.rspec because the HOME environment variable is not set" + nil ++ # :nocov: + end + end + end +diff --git a/spec/rspec/core/configuration_options_spec.rb b/spec/rspec/core/configuration_options_spec.rb +index 7004bed..af3f6d4 100644 +--- a/spec/rspec/core/configuration_options_spec.rb ++++ b/spec/rspec/core/configuration_options_spec.rb +@@ -4,7 +4,9 @@ + RSpec.describe RSpec::Core::ConfigurationOptions, :isolated_directory => true, :isolated_home => true do + include ConfigOptionsHelper + +- it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java' || RSpec::Support::OS.windows?) do ++ # On Ruby 2.4, `File.expand("~")` works even if `ENV['HOME']` is not set. ++ # But on earlier versions, it fails. ++ it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java' || RSpec::Support::OS.windows? || RUBY_VERSION >= '2.4') do + without_env_vars 'HOME' do + expect_warning_with_call_site(__FILE__, __LINE__ + 1) + RSpec::Core::ConfigurationOptions.new([]).options diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index bde9321..348c2b8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -28,6 +28,9 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh +# Fix Ruby 2.4 compatibility. +# https://github.com/rspec/rspec-core/pull/2363 +Patch0: rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -79,6 +82,10 @@ gem unpack %{SOURCE0} gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec +pushd %{gem_name}-%{version} +%patch0 -p1 +popd + %build gem build %{gem_name}.gemspec %gem_install @@ -121,9 +128,14 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { ${FAILFILE[$i]} } -# FIXME -# Currently Fedora has aruba 0.6.2, however with aruba 0.14.0 -# many tests fail. +# Fix compatibility with Aruba 0.14.0. Not sure if this is upstreamble, since +# it seems Aruba 0.7.0+ might have some Ruby 1.8.7 compatibility issues ... +sed -i 's/in_current_dir/cd(".")/' \ + spec/{integration/{failed_line_detection,filtering,persistence_failures}_spec,support/aruba_support}.rb +sed -i 's/clean_current_dir/setup_aruba/' \ + spec/integration/{failed_line_detection,filtering,persistence_failures,suite_hooks_errors}_spec.rb +sed -i 's/remove_file/remove/' spec/integration/order_spec.rb + ruby -rubygems -Ilib/ -S exe/rspec || \ ruby -rubygems -Ilib/ -S exe/rspec --tag ~broken @@ -149,6 +161,9 @@ popd %{gem_docdir} %changelog +* Tue Jan 31 2017 Vít Ondruch - 3.5.4-2 +- Fix Ruby 2.4 and Aruba 0.14.0 compatibility. + * Mon Oct 10 2016 Mamoru TASAKA - 3.5.4-1 - 3.5.4 From 6f15982eb98d4c5f02c7720a6effa0fc9d5d9b81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 12:44:33 +0000 Subject: [PATCH 038/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 348c2b8..738b4b2 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -19,7 +19,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT @@ -161,6 +161,9 @@ popd %{gem_docdir} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.5.4-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 31 2017 Vít Ondruch - 3.5.4-2 - Fix Ruby 2.4 and Aruba 0.14.0 compatibility. From 346449013a96199e2a3a4fbc9174ec928b50d82a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Feb 2017 16:46:17 +0900 Subject: [PATCH 039/126] Always use full tar.gz for installed files and keep using gem file for gem spec (ref: bug 1425220) --- rubygem-rspec-core.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 738b4b2..8c39b97 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 3 %global gem_name rspec-core @@ -76,15 +76,9 @@ This package contains documentation for %{name}. %prep -gem unpack %{SOURCE0} - -%setup -q -D -T -n %{gem_name}-%{version} -a 1 - +%setup -q -T -n %{gem_name}-%{version} -b 1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec - -pushd %{gem_name}-%{version} %patch0 -p1 -popd %build gem build %{gem_name}.gemspec @@ -100,7 +94,6 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %if 0%{?need_bootstrap_set} < 1 %check LANG=en_US.UTF-8 -pushd %{gem_name}-%{version} # Test failure needs investigation... # perhaps due to some incompatibility between libxml2 2.9.x # and rubygem-nokogiri @@ -130,17 +123,16 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { # Fix compatibility with Aruba 0.14.0. Not sure if this is upstreamble, since # it seems Aruba 0.7.0+ might have some Ruby 1.8.7 compatibility issues ... +%if 0%{?fedora} >= 26 sed -i 's/in_current_dir/cd(".")/' \ spec/{integration/{failed_line_detection,filtering,persistence_failures}_spec,support/aruba_support}.rb sed -i 's/clean_current_dir/setup_aruba/' \ spec/integration/{failed_line_detection,filtering,persistence_failures,suite_hooks_errors}_spec.rb sed -i 's/remove_file/remove/' spec/integration/order_spec.rb +%endif ruby -rubygems -Ilib/ -S exe/rspec || \ ruby -rubygems -Ilib/ -S exe/rspec --tag ~broken - -popd - %endif %files @@ -161,6 +153,10 @@ popd %{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) + * Sat Feb 11 2017 Fedora Release Engineering - 3.5.4-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 0a9824c42e544fd4a7dc0e76e3ace7e8bcd253ab Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 22:15:17 +0900 Subject: [PATCH 040/126] 3.6.0 Once disable tests --- .gitignore | 1 + rubygem-rspec-core.spec | 39 ++++++++++++++++++++++++--------------- sources | 3 +-- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 20304d0..f2996dd 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /rubygem-rspec-core-3.5.3-full.tar.gz /rspec-core-3.5.4.gem /rubygem-rspec-core-3.5.4-full.tar.gz +/rspec-core-3.6.0.gem diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 8c39b97..186860e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,25 +1,25 @@ -%global majorver 3.5.4 +%global majorver 3.6.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 0.1 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %if 0%{?fedora} >= 25 # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %endif Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -28,9 +28,6 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh -# Fix Ruby 2.4 compatibility. -# https://github.com/rspec/rspec-core/pull/2363 -Patch0: rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -78,7 +75,6 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch0 -p1 %build gem build %{gem_name}.gemspec @@ -104,11 +100,14 @@ FAILFILE+=("spec/rspec/core/formatters/progress_formatter_spec.rb") FAILTEST+=("produces the expected full output") FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb") FAILTEST+=("produces the expected full output") -FAILFILE+=("spec/rspec/core/source/syntax_highlighter_spec.rb") +FAILFILE+=("spec/rspec/core/formatters/syntax_highlighter_spec.rb") FAILTEST+=("when CodeRay is available") # New from 3.5.3 FAILFILE+=("spec/integration/suite_hooks_errors_spec.rb") FAILTEST+=("nicely formats errors") +# New from 3.6.0 +FAILFILE+=("spec/integration/spec_file_load_errors_spec.rb") +FAILTEST+=("nicely handles load-time errors") # NET?? FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with 127.0.0.1") @@ -124,11 +123,17 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { # Fix compatibility with Aruba 0.14.0. Not sure if this is upstreamble, since # it seems Aruba 0.7.0+ might have some Ruby 1.8.7 compatibility issues ... %if 0%{?fedora} >= 26 -sed -i 's/in_current_dir/cd(".")/' \ - spec/{integration/{failed_line_detection,filtering,persistence_failures}_spec,support/aruba_support}.rb -sed -i 's/clean_current_dir/setup_aruba/' \ - spec/integration/{failed_line_detection,filtering,persistence_failures,suite_hooks_errors}_spec.rb -sed -i 's/remove_file/remove/' spec/integration/order_spec.rb +grep -rl 'in_current_dir' | \ + xargs sed -i 's/in_current_dir/cd(".")/' +grep -rl 'clean_current_dir' spec/ | \ + xargs sed -i 's/clean_current_dir/setup_aruba/' +sed -i 's/remove_file/remove/' \ + spec/integration/order_spec.rb \ + %{nil} +sed -i '\@expect.*dirs\.pop@d' \ + spec/integration/spec_file_load_errors_spec.rb \ + spec/integration/suite_hooks_errors_spec.rb \ + %{nil} %endif ruby -rubygems -Ilib/ -S exe/rspec || \ @@ -153,6 +158,10 @@ ruby -rubygems -Ilib/ -S exe/rspec || \ %{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 f10715f..67b0191 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -da331ca42abe7036dce4f79ea5dada47 rspec-core-3.5.4.gem -8d275bf3ba4097068e79e4b61d3c9734 rubygem-rspec-core-3.5.4-full.tar.gz +SHA512 (rspec-core-3.6.0.gem) = a2c02421ada8f4dc640056a972f39ea6b4654c5cb3431eaca867d7a9ac304e098b5cffab54812022188a2398feb79a24d60e8a6a5bfe47615097ca2e436fc52f From 8e5bda20c9da789b6e3555831b168e9b3a3c6191 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 22:18:11 +0900 Subject: [PATCH 041/126] remove patch --- rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch | 104 ---------------------- 1 file changed, 104 deletions(-) delete mode 100644 rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch diff --git a/rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch b/rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch deleted file mode 100644 index 65b7e6c..0000000 --- a/rspec-core-3.5.4-Fixes-for-Ruby-2.4.patch +++ /dev/null @@ -1,104 +0,0 @@ -From c6b11177fcd951380fa1d267944681bf08044aac Mon Sep 17 00:00:00 2001 -From: Myron Marston -Date: Mon, 26 Dec 2016 10:19:31 -0800 -Subject: [PATCH 1/2] Change example of invalid option to `--foo_bar`. - -`--default_path` seems to be interpretted as `--default-path` -on Ruby 2.4, which is valid. ---- - spec/rspec/core/configuration_options_spec.rb | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/spec/rspec/core/configuration_options_spec.rb b/spec/rspec/core/configuration_options_spec.rb -index f170192..7004bed 100644 ---- a/spec/rspec/core/configuration_options_spec.rb -+++ b/spec/rspec/core/configuration_options_spec.rb -@@ -395,7 +395,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) - expect { - parse_options(*options) - }.to raise_error(SystemExit).and output(a_string_including( -- "invalid option: --default_path (defined in #{source})", -+ "invalid option: --foo_bar (defined in #{source})", - "Please use --help for a listing of valid options" - )).to_stderr - end -@@ -404,7 +404,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) - context "defined in #{file_name}" do - it "mentions the file name in the error so users know where to look for it" do - file_name = File.expand_path(file_name) if file_name.start_with?("~") -- File.open(File.expand_path(file_name), "w") { |f| f << "--default_path" } -+ File.open(File.expand_path(file_name), "w") { |f| f << "--foo_bar" } - expect_parsing_to_fail_mentioning_source(file_name) - end - end -@@ -412,7 +412,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) - - context "defined in SPEC_OPTS" do - it "mentions ENV['SPEC_OPTS'] as the source in the error so users know where to look for it" do -- with_env_vars 'SPEC_OPTS' => "--default_path" do -+ with_env_vars 'SPEC_OPTS' => "--foo_bar" do - expect_parsing_to_fail_mentioning_source("ENV['SPEC_OPTS']") - end - end -@@ -420,7 +420,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) - - context "defined in a custom file" do - it "mentions the custom file as the source of the error so users know where to look for it" do -- File.open("./custom.opts", "w") {|f| f << "--default_path"} -+ File.open("./custom.opts", "w") {|f| f << "--foo_bar"} - - expect_parsing_to_fail_mentioning_source("./custom.opts", %w[-O ./custom.opts]) - end -@@ -428,9 +428,9 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) - context "passed at the command line" do - it "does not mention the source since it is obvious where it came from" do - expect { -- parse_options("--default_path") -+ parse_options("--foo_bar") - }.to raise_error(SystemExit).and output(a_string_including( -- "invalid option: --default_path\n", -+ "invalid option: --foo_bar\n", - "Please use --help for a listing of valid options" - )).to_stderr - end - -From dba6b95888f79ce5a24bf986bfb5d31385f71bb9 Mon Sep 17 00:00:00 2001 -From: Myron Marston -Date: Mon, 26 Dec 2016 10:24:06 -0800 -Subject: [PATCH 2/2] Exclude spec on Ruby 2.4 that fails and is not needed. - ---- - lib/rspec/core/configuration_options.rb | 2 ++ - spec/rspec/core/configuration_options_spec.rb | 4 +++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lib/rspec/core/configuration_options.rb b/lib/rspec/core/configuration_options.rb -index f46df2f..1b93e8c 100644 ---- a/lib/rspec/core/configuration_options.rb -+++ b/lib/rspec/core/configuration_options.rb -@@ -186,8 +186,10 @@ def local_options_file - def global_options_file - File.join(File.expand_path("~"), ".rspec") - rescue ArgumentError -+ # :nocov: - RSpec.warning "Unable to find ~/.rspec because the HOME environment variable is not set" - nil -+ # :nocov: - end - end - end -diff --git a/spec/rspec/core/configuration_options_spec.rb b/spec/rspec/core/configuration_options_spec.rb -index 7004bed..af3f6d4 100644 ---- a/spec/rspec/core/configuration_options_spec.rb -+++ b/spec/rspec/core/configuration_options_spec.rb -@@ -4,7 +4,9 @@ - RSpec.describe RSpec::Core::ConfigurationOptions, :isolated_directory => true, :isolated_home => true do - include ConfigOptionsHelper - -- it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java' || RSpec::Support::OS.windows?) do -+ # On Ruby 2.4, `File.expand("~")` works even if `ENV['HOME']` is not set. -+ # But on earlier versions, it fails. -+ it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java' || RSpec::Support::OS.windows? || RUBY_VERSION >= '2.4') do - without_env_vars 'HOME' do - expect_warning_with_call_site(__FILE__, __LINE__ + 1) - RSpec::Core::ConfigurationOptions.new([]).options From 72bac054052966345690869c20063921695b96f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 22:24:56 +0900 Subject: [PATCH 042/126] add full source --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f2996dd..3a6b447 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /rspec-core-3.5.4.gem /rubygem-rspec-core-3.5.4-full.tar.gz /rspec-core-3.6.0.gem +/rubygem-rspec-core-3.6.0-full.tar.gz diff --git a/sources b/sources index 67b0191..b2dd52d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (rspec-core-3.6.0.gem) = a2c02421ada8f4dc640056a972f39ea6b4654c5cb3431eaca867d7a9ac304e098b5cffab54812022188a2398feb79a24d60e8a6a5bfe47615097ca2e436fc52f +SHA512 (rubygem-rspec-core-3.6.0-full.tar.gz) = 093cad5a1f7d4ea148dd25064068faec9f0ad1c339cb5b12d194594262e46345e83fa98919ce103110dbe3425be380a2f187cb3146456a96c8640aa6d4ab91bb From 2f1719c8e9d66b60ef7cecf3f543533675176261 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 23:33:57 +0900 Subject: [PATCH 043/126] Enable tests again --- rubygem-rspec-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 186860e..401a414 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,13 +3,13 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 0.1 +%global fedorarel 1 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %if 0%{?fedora} >= 25 # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba @@ -158,6 +158,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || \ %{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 e8a2549a5ee39460ec2236d8584d28bb073a0c6b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2017 23:44:35 +0900 Subject: [PATCH 044/126] really enable test --- rubygem-rspec-core.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 401a414..95975b2 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -13,13 +13,13 @@ %if 0%{?fedora} >= 25 # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %endif Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT From 849eaebbcc9eec861c7cbc6b71e72df84a38e471 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 17:44:20 +0000 Subject: [PATCH 045/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 95975b2..e2ebbf2 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -19,7 +19,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.2 Group: Development/Languages License: MIT @@ -158,6 +158,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || \ %{gem_docdir} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.6.0-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat May 6 2017 Mamoru TASAKA - 3.6.0-1 - Enable tests again From c0cd6b602fdf4311408835ea8e97a1e111e9aeeb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Nov 2017 15:48:45 +0900 Subject: [PATCH 046/126] 3.7.0 Once disable tests --- .gitignore | 2 ++ rubygem-rspec-core.spec | 12 ++++++++---- sources | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3a6b447..85cc7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ /rubygem-rspec-core-3.5.4-full.tar.gz /rspec-core-3.6.0.gem /rubygem-rspec-core-3.6.0-full.tar.gz +/rspec-core-3.7.0.gem +/rubygem-rspec-core-3.7.0-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index e2ebbf2..c50cd53 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.6.0 +%global majorver 3.7.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 0.1 %global gem_name rspec-core @@ -13,13 +13,13 @@ %if 0%{?fedora} >= 25 # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %endif Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.2 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -158,6 +158,10 @@ ruby -rubygems -Ilib/ -S exe/rspec || \ %{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.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index b2dd52d..22e308d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.6.0.gem) = a2c02421ada8f4dc640056a972f39ea6b4654c5cb3431eaca867d7a9ac304e098b5cffab54812022188a2398feb79a24d60e8a6a5bfe47615097ca2e436fc52f -SHA512 (rubygem-rspec-core-3.6.0-full.tar.gz) = 093cad5a1f7d4ea148dd25064068faec9f0ad1c339cb5b12d194594262e46345e83fa98919ce103110dbe3425be380a2f187cb3146456a96c8640aa6d4ab91bb +SHA512 (rspec-core-3.7.0.gem) = 07063673c7dbcd08e148fba14823cfb8d07e11dbfded0b3b5f1196e8c92366a769c3911c70c6b4513b2ad144788da711e751a3e4382ddba8362a13c7a968618c +SHA512 (rubygem-rspec-core-3.7.0-full.tar.gz) = b54d56a1fd7e07f57bd498112847f954a2ea0937a58053289037f011e03558d59fb9a5a0f59ab4e2106a2ca7b5bd7a80844cb6aa3d5b71923a2daf1ef0586f95 From c0316e6a2eee44fdaaeae527c9d91c8cc78fe073 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Nov 2017 15:58:53 +0900 Subject: [PATCH 047/126] Enable tests again --- rubygem-rspec-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index c50cd53..a93656e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 0.1 +%global fedorarel 1 %global gem_name rspec-core @@ -13,7 +13,7 @@ %if 0%{?fedora} >= 25 # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %endif Summary: Rspec-2 runner and formatters @@ -158,6 +158,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || \ %{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 7247e33605251e4d4316c57e225c67ff26814247 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2018 17:56:40 +0900 Subject: [PATCH 048/126] 3.7.1 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 85cc7cc..fae76bf 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ /rubygem-rspec-core-3.6.0-full.tar.gz /rspec-core-3.7.0.gem /rubygem-rspec-core-3.7.0-full.tar.gz +/rspec-core-3.7.1.gem +/rubygem-rspec-core-3.7.1-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index a93656e..5aacdc4 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.7.0 +%global majorver 3.7.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -158,6 +158,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || \ %{gem_docdir} %changelog +* Wed Jan 3 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 22e308d..ec87abc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.7.0.gem) = 07063673c7dbcd08e148fba14823cfb8d07e11dbfded0b3b5f1196e8c92366a769c3911c70c6b4513b2ad144788da711e751a3e4382ddba8362a13c7a968618c -SHA512 (rubygem-rspec-core-3.7.0-full.tar.gz) = b54d56a1fd7e07f57bd498112847f954a2ea0937a58053289037f011e03558d59fb9a5a0f59ab4e2106a2ca7b5bd7a80844cb6aa3d5b71923a2daf1ef0586f95 +SHA512 (rspec-core-3.7.1.gem) = 86e091642e35d41a82a20e314cd71fe23e1de1bd6008d9fed82b5078616aa1815e5a1f049a996283d90d8b638e3b0e004ecd9136f0b85d60b1636929f39fa511 +SHA512 (rubygem-rspec-core-3.7.1-full.tar.gz) = d6fb3788f4d5260f613ad502eee39a1485f18d4e7437d90aef14fb315c23821a62f8c5b5a8fadc1c6835166b96603dbd941a86d81dd6890729d43ed31cc5434b From 623a3c86d3c4b4f01e7ddab9121e2dfb72b0dd67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 14:47:25 +0000 Subject: [PATCH 049/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 5aacdc4..642d838 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -19,7 +19,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT @@ -158,6 +158,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || \ %{gem_docdir} %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.7.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 3 2018 Mamoru TASAKA - 3.7.1-1 - 3.7.1 From 4c1a79d0ef37e8f87928ea546c90b699f930d44d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 13 Feb 2018 12:49:01 +0900 Subject: [PATCH 050/126] ruby 2.5 drops -rubygems usage --- rubygem-rspec-core.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 642d838..70a490b 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -16,10 +16,12 @@ %global need_bootstrap_set 0 %endif +%undefine __brp_mangle_shebangs + Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -136,8 +138,8 @@ sed -i '\@expect.*dirs\.pop@d' \ %{nil} %endif -ruby -rubygems -Ilib/ -S exe/rspec || \ - ruby -rubygems -Ilib/ -S exe/rspec --tag ~broken +ruby -rrubygems -Ilib/ -S exe/rspec || \ + ruby -rrubygems -Ilib/ -S exe/rspec --tag ~broken %endif %files @@ -158,6 +160,9 @@ ruby -rubygems -Ilib/ -S exe/rspec || \ %{gem_docdir} %changelog +* Tue Feb 13 2018 Mamoru TASAKA - 3.7.1-2 +- ruby 2.5 drops -rubygems usage + * Fri Feb 09 2018 Fedora Release Engineering - 3.7.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9bc1b26b34fff132629ea23112984afaaec742db Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 23 Feb 2018 08:54:49 -0800 Subject: [PATCH 051/126] Update conditionals --- rubygem-rspec-core.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 70a490b..2b49d57 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 3 %global gem_name rspec-core @@ -47,7 +47,7 @@ BuildRequires: rubygem(coderay) BuildRequires: rubygem(thread_order) BuildRequires: git -%if 0%{?fedora} >= 24 +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: glibc-langpack-en %endif @@ -124,7 +124,7 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { # Fix compatibility with Aruba 0.14.0. Not sure if this is upstreamble, since # it seems Aruba 0.7.0+ might have some Ruby 1.8.7 compatibility issues ... -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} > 7 grep -rl 'in_current_dir' | \ xargs sed -i 's/in_current_dir/cd(".")/' grep -rl 'clean_current_dir' spec/ | \ @@ -160,6 +160,9 @@ ruby -rrubygems -Ilib/ -S exe/rspec || \ %{gem_docdir} %changelog +* Fri Feb 23 2018 Troy Dawson - 3.7.1-3 +- Update conditionals + * Tue Feb 13 2018 Mamoru TASAKA - 3.7.1-2 - ruby 2.5 drops -rubygems usage From f68b421ad989433e238979762b21dcd7f93ada7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 04:43:18 +0000 Subject: [PATCH 052/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 2b49d57..333aabb 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -21,7 +21,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Group: Development/Languages License: MIT @@ -160,6 +160,9 @@ ruby -rrubygems -Ilib/ -S exe/rspec || \ %{gem_docdir} %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.7.1-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 23 2018 Troy Dawson - 3.7.1-3 - Update conditionals From 4923c9d33f17fddd1707bc6fa29c073c154e59dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 18 Nov 2018 22:41:17 +0100 Subject: [PATCH 053/126] Use C.UTF-8 locale --- rubygem-rspec-core.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 333aabb..46b0f74 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -21,13 +21,13 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.2 Group: Development/Languages License: MIT URL: http://github.com/rspec/rspec-mocks Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem -# %%{SOURCE2} %%{name} %%{version} +# %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh @@ -91,7 +91,7 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %if 0%{?need_bootstrap_set} < 1 %check -LANG=en_US.UTF-8 +LANG=C.UTF-8 # Test failure needs investigation... # perhaps due to some incompatibility between libxml2 2.9.x # and rubygem-nokogiri @@ -160,6 +160,10 @@ ruby -rrubygems -Ilib/ -S exe/rspec || \ %{gem_docdir} %changelog +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 3.7.1-3.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-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a8b44428391704ff35645d62d4593aec55176a73 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Dec 2018 14:07:40 +0900 Subject: [PATCH 054/126] 3.8.0 Once disable test for bootstrap --- .gitignore | 2 ++ rubygem-rspec-core.spec | 17 +++++++++-------- sources | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index fae76bf..af7138e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ /rubygem-rspec-core-3.7.0-full.tar.gz /rspec-core-3.7.1.gem /rubygem-rspec-core-3.7.1-full.tar.gz +/rspec-core-3.8.0.gem +/rubygem-rspec-core-3.8.0-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 46b0f74..d5e68c9 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,27 +1,24 @@ -%global majorver 3.7.1 +%global majorver 3.8.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 0.1 %global gem_name rspec-core # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 0 -%if 0%{?fedora} >= 25 # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba %global need_bootstrap_set 0 -%endif %undefine __brp_mangle_shebangs Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.2 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -102,8 +99,8 @@ FAILFILE+=("spec/rspec/core/formatters/progress_formatter_spec.rb") FAILTEST+=("produces the expected full output") FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb") FAILTEST+=("produces the expected full output") -FAILFILE+=("spec/rspec/core/formatters/syntax_highlighter_spec.rb") -FAILTEST+=("when CodeRay is available") +#FAILFILE+=("spec/rspec/core/formatters/syntax_highlighter_spec.rb") +#FAILTEST+=("when CodeRay is available") # New from 3.5.3 FAILFILE+=("spec/integration/suite_hooks_errors_spec.rb") FAILTEST+=("nicely formats errors") @@ -160,6 +157,10 @@ ruby -rrubygems -Ilib/ -S exe/rspec || \ %{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-3.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 ec87abc..65e3d7e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.7.1.gem) = 86e091642e35d41a82a20e314cd71fe23e1de1bd6008d9fed82b5078616aa1815e5a1f049a996283d90d8b638e3b0e004ecd9136f0b85d60b1636929f39fa511 -SHA512 (rubygem-rspec-core-3.7.1-full.tar.gz) = d6fb3788f4d5260f613ad502eee39a1485f18d4e7437d90aef14fb315c23821a62f8c5b5a8fadc1c6835166b96603dbd941a86d81dd6890729d43ed31cc5434b +SHA512 (rspec-core-3.8.0.gem) = c3163b4bc8463c9b6ac86921fb315d000b944f7b825f489ebc264473aa3ee8a61eb7bec92b7b528da40a051a83ef14d341790087d21746b1da142981f5d16ab0 +SHA512 (rubygem-rspec-core-3.8.0-full.tar.gz) = 4899f3610090b23bf717baa0f8f40503fe3db7fe7d9339d9422e4edcbeedfb8bfe20cda3ce45947765d6843a4c6cfb20addf59b9b23f96707bbe1898043bea31 From 808e733e36e8ac0d400c51568b464594a42600c4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Dec 2018 14:21:16 +0900 Subject: [PATCH 055/126] oops... --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index d5e68c9..4906499 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %undefine __brp_mangle_shebangs From 8b87153c803c64d717e6e529e372a5e2e19eeb44 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Dec 2018 14:46:51 +0900 Subject: [PATCH 056/126] Enable tests again --- rubygem-rspec-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 4906499..7230f18 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 0.1 +%global fedorarel 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %undefine __brp_mangle_shebangs @@ -157,6 +157,9 @@ ruby -rrubygems -Ilib/ -S exe/rspec || \ %{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 f812a3557c11d5fbff9ed13777994fe4ce67bd84 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 1 Jan 2019 17:03:42 +0900 Subject: [PATCH 057/126] A Happy New Year Suppress some test errors related to missing HOME env and real tty --- rubygem-rspec-core.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 7230f18..60846ca 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -135,10 +135,22 @@ sed -i '\@expect.*dirs\.pop@d' \ %{nil} %endif +# Well, when HOME variable is not set and tty is not a real one +# but pseudo-tty, with current ruby implementation $ env -i ruby -e 'p Dir.home' +# causes: +# `home': couldn't find login name -- expanding `~' (ArgumentError) +# - and this causes some test errors on rspec-core. +# fixing this error without modifying rspec-core "code" is very hard, +# once modifying source itself. +sed -i.warn lib/rspec/core/configuration_options.rb \ + -e '\@because the HOME environment variable is not set@s|RSpec\.warning|#RSpec.warning|' + ruby -rrubygems -Ilib/ -S exe/rspec || \ ruby -rrubygems -Ilib/ -S exe/rspec --tag ~broken %endif +mv lib/rspec/core/configuration_options.rb{.warn,} + %files %dir %{gem_instdir} @@ -157,6 +169,10 @@ ruby -rrubygems -Ilib/ -S exe/rspec || \ %{gem_docdir} %changelog +* Tue Jan 1 2019 Mamoru TASAKA - 3.8.0-2 +- A Happy New Year +- Suppress some test errors related to missing HOME env and real tty + * Thu Dec 13 2018 Mamoru TASAKA - 3.8.0-1 - Enable tests again From 72543683cc2998977a80c83a676d5b6f57fe6bd3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:23 +0100 Subject: [PATCH 058/126] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- rubygem-rspec-core.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 60846ca..8f75b9c 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -20,7 +20,6 @@ Name: rubygem-%{gem_name} Version: %{majorver} Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} -Group: Development/Languages License: MIT URL: http://github.com/rspec/rspec-mocks Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem @@ -64,7 +63,6 @@ Behaviour Driven Development for Ruby. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} %description doc From 388dd57b7ef94f57256bee89b92db63b52b2978a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 12:56:47 +0000 Subject: [PATCH 059/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 8f75b9c..43c574a 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -167,6 +167,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.8.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 1 2019 Mamoru TASAKA - 3.8.0-2 - A Happy New Year - Suppress some test errors related to missing HOME env and real tty From 892bf788f9eb082dbcea4047e7403b4768fb6167 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 21 Jun 2019 16:05:47 +0900 Subject: [PATCH 060/126] 3.8.1 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 24 +++++++++++++++++++++--- sources | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index af7138e..af7ed2f 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ /rubygem-rspec-core-3.7.1-full.tar.gz /rspec-core-3.8.0.gem /rubygem-rspec-core-3.8.0-full.tar.gz +/rspec-core-3.8.1.gem +/rubygem-rspec-core-3.8.1-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 43c574a..d1509c3 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.8.0 +%global majorver 3.8.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -110,6 +110,20 @@ FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with 127.0.0.1") FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with localhost") +# 3.8.0, ignore for now +FAILFILE+=("spec/rspec/core/bisect/server_spec.rb") +FAILTEST+=("receives suite results") +FAILFILE+=("spec/rspec/core/bisect/server_spec.rb") +FAILTEST+=("aborts as soon as the last expected failure finishes") +FAILFILE+=("spec/rspec/core/bisect/server_spec.rb") +FAILTEST+=("aborts after an expected failure") +# 3.8.0, ignore for now +FAILFILE+=("spec/integration/bisect_runners_spec.rb") +FAILTEST+=("honors.*run_all_when_everything_filtered") +FAILFILE+=("spec/integration/bisect_runners_spec.rb") +FAILTEST+=("raises BisectFailedError") +FAILFILE+=("spec/integration/bisect_runners_spec.rb") +FAILTEST+=("runs the specs in an isolated environment") for ((i = 0; i < ${#FAILFILE[@]}; i++)) { sed -i \ @@ -117,6 +131,7 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { ${FAILFILE[$i]} } + # Fix compatibility with Aruba 0.14.0. Not sure if this is upstreamble, since # it seems Aruba 0.7.0+ might have some Ruby 1.8.7 compatibility issues ... %if 0%{?fedora} >= 26 || 0%{?rhel} > 7 @@ -167,6 +182,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Fri Jun 21 2019 Mamoru TASAKA - 3.8.1-1 +- 3.8.1 + * Sat Feb 02 2019 Fedora Release Engineering - 3.8.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 65e3d7e..5358959 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.8.0.gem) = c3163b4bc8463c9b6ac86921fb315d000b944f7b825f489ebc264473aa3ee8a61eb7bec92b7b528da40a051a83ef14d341790087d21746b1da142981f5d16ab0 -SHA512 (rubygem-rspec-core-3.8.0-full.tar.gz) = 4899f3610090b23bf717baa0f8f40503fe3db7fe7d9339d9422e4edcbeedfb8bfe20cda3ce45947765d6843a4c6cfb20addf59b9b23f96707bbe1898043bea31 +SHA512 (rspec-core-3.8.1.gem) = a9fa6630b66aba10d299640f35c7b6e228650f2c6fae76de00a7eb4ef30f486abe004cabaed9a08a8f4d1dcf13fb62dbfef447762dc26681c1fb4ab0d6ce1e51 +SHA512 (rubygem-rspec-core-3.8.1-full.tar.gz) = 963326dc7b940a290f7dadd87ee445e146eb6d4c61115ec00e4e8fd5840589a221e021fa158c6c4a98da05cf3b9987ea8a8e394dc52f81c179eab1af04a5c288 From ee55781c778d9c8215a32c620eda127578c0a59b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 10 Jul 2019 15:23:04 +0900 Subject: [PATCH 061/126] 3.8.2 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index af7ed2f..d890334 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ /rubygem-rspec-core-3.8.0-full.tar.gz /rspec-core-3.8.1.gem /rubygem-rspec-core-3.8.1-full.tar.gz +/rspec-core-3.8.2.gem +/rubygem-rspec-core-3.8.2-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index d1509c3..09ecf63 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.8.1 +%global majorver 3.8.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -182,6 +182,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Wed Jul 10 2019 Mamoru TASAKA - 3.8.2-1 +- 3.8.2 + * Fri Jun 21 2019 Mamoru TASAKA - 3.8.1-1 - 3.8.1 diff --git a/sources b/sources index 5358959..7597d10 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.8.1.gem) = a9fa6630b66aba10d299640f35c7b6e228650f2c6fae76de00a7eb4ef30f486abe004cabaed9a08a8f4d1dcf13fb62dbfef447762dc26681c1fb4ab0d6ce1e51 -SHA512 (rubygem-rspec-core-3.8.1-full.tar.gz) = 963326dc7b940a290f7dadd87ee445e146eb6d4c61115ec00e4e8fd5840589a221e021fa158c6c4a98da05cf3b9987ea8a8e394dc52f81c179eab1af04a5c288 +SHA512 (rspec-core-3.8.2.gem) = 167bdc8a87ecd2e304e30efab9ebf1d7b8a7b811e197da440ae6dc4acd3213f6643316683db15322eb07ab201b517725dfdb50f85415b1e38e9772746c3b5379 +SHA512 (rubygem-rspec-core-3.8.2-full.tar.gz) = af3e7d7579c4a15c4824b4000eb5ebe9a62bdb963a0d3d16d1bcecb9ed14b58c29137541c6d26f9cc0bc5eef1d4a42bb93fb979e5a3aba0da6381547d2828fbe From 029c20839b62659b1cba6eb2cb0337602253589a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 20:02:49 +0000 Subject: [PATCH 062/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 09ecf63..5c580dc 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -182,6 +182,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{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 + * Wed Jul 10 2019 Mamoru TASAKA - 3.8.2-1 - 3.8.2 From b720dfdfb9ce4e6827ec034b7467ea1b673a45cc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Dec 2019 14:58:44 +0900 Subject: [PATCH 063/126] 3.9.0 Once disable test for bootstrap --- .gitignore | 2 ++ rubygem-rspec-core.spec | 36 +++++++++++++++--------------------- sources | 4 ++-- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index d890334..48dcacd 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ /rubygem-rspec-core-3.8.1-full.tar.gz /rspec-core-3.8.2.gem /rubygem-rspec-core-3.8.2-full.tar.gz +/rspec-core-3.9.0.gem +/rubygem-rspec-core-3.9.0-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 5c580dc..bb942da 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.8.2 +%global majorver 3.9.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 0.1 %global gem_name rspec-core @@ -11,14 +11,14 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %undefine __brp_mangle_shebangs Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -110,6 +110,7 @@ FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with 127.0.0.1") FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with localhost") +%if 0 # 3.8.0, ignore for now FAILFILE+=("spec/rspec/core/bisect/server_spec.rb") FAILTEST+=("receives suite results") @@ -124,6 +125,10 @@ FAILFILE+=("spec/integration/bisect_runners_spec.rb") FAILTEST+=("raises BisectFailedError") FAILFILE+=("spec/integration/bisect_runners_spec.rb") FAILTEST+=("runs the specs in an isolated environment") +%endif +# New from 3.9.0 +FAILFILE+=("spec/integration/spec_file_load_errors_spec.rb") +FAILTEST+=("prints a single error when it happens") for ((i = 0; i < ${#FAILFILE[@]}; i++)) { sed -i \ @@ -132,22 +137,6 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) { } -# Fix compatibility with Aruba 0.14.0. Not sure if this is upstreamble, since -# it seems Aruba 0.7.0+ might have some Ruby 1.8.7 compatibility issues ... -%if 0%{?fedora} >= 26 || 0%{?rhel} > 7 -grep -rl 'in_current_dir' | \ - xargs sed -i 's/in_current_dir/cd(".")/' -grep -rl 'clean_current_dir' spec/ | \ - xargs sed -i 's/clean_current_dir/setup_aruba/' -sed -i 's/remove_file/remove/' \ - spec/integration/order_spec.rb \ - %{nil} -sed -i '\@expect.*dirs\.pop@d' \ - spec/integration/spec_file_load_errors_spec.rb \ - spec/integration/suite_hooks_errors_spec.rb \ - %{nil} -%endif - # Well, when HOME variable is not set and tty is not a real one # but pseudo-tty, with current ruby implementation $ env -i ruby -e 'p Dir.home' # causes: @@ -160,10 +149,11 @@ sed -i.warn lib/rspec/core/configuration_options.rb \ ruby -rrubygems -Ilib/ -S exe/rspec || \ ruby -rrubygems -Ilib/ -S exe/rspec --tag ~broken -%endif mv lib/rspec/core/configuration_options.rb{.warn,} +%endif + %files %dir %{gem_instdir} @@ -182,6 +172,10 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{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 7597d10..9d89be1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.8.2.gem) = 167bdc8a87ecd2e304e30efab9ebf1d7b8a7b811e197da440ae6dc4acd3213f6643316683db15322eb07ab201b517725dfdb50f85415b1e38e9772746c3b5379 -SHA512 (rubygem-rspec-core-3.8.2-full.tar.gz) = af3e7d7579c4a15c4824b4000eb5ebe9a62bdb963a0d3d16d1bcecb9ed14b58c29137541c6d26f9cc0bc5eef1d4a42bb93fb979e5a3aba0da6381547d2828fbe +SHA512 (rspec-core-3.9.0.gem) = 5ba53020970ae29b851b7524e53e20dc6668af0e16c306d239f6470c899fad44649c44fd5180c7b7614ae3e3b8c5d872cdece3f15470cb0f80076b5250c5c992 +SHA512 (rubygem-rspec-core-3.9.0-full.tar.gz) = c7f4138b6f81a4e441f316d821f972881e2be4739254b9bd51d68c35e4ca3ff1206b13be60994050d580b52f9b6dd37d6ffc7334598e16a262006493e8dd8d85 From 8caf35fc9d3f8cf5c85d8094a8bfa649bbc27528 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Dec 2019 15:52:55 +0900 Subject: [PATCH 064/126] Enable tests again --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index bb942da..e77498e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 0.1 +%global fedorarel 1 %global gem_name rspec-core @@ -172,6 +172,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{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 cf722a52b603d7c7d4f6b975bc525cddaa1dac50 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Dec 2019 16:15:40 +0900 Subject: [PATCH 065/126] enable tests again, really --- rubygem-rspec-core.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index e77498e..f1a0d0e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %undefine __brp_mangle_shebangs @@ -172,7 +172,7 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{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 ff1d6e8472ad25a91b857b48cc1ff128ab5195bd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Dec 2019 16:26:15 +0900 Subject: [PATCH 066/126] Enable tests again which failed on 3.8.0 but now succeeds on 3.9.0 --- rubygem-rspec-core.spec | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index f1a0d0e..af1c738 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -110,22 +110,6 @@ FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with 127.0.0.1") FAILFILE+=("spec/rspec/core/runner_spec.rb") FAILTEST+=("if drb server is started with localhost") -%if 0 -# 3.8.0, ignore for now -FAILFILE+=("spec/rspec/core/bisect/server_spec.rb") -FAILTEST+=("receives suite results") -FAILFILE+=("spec/rspec/core/bisect/server_spec.rb") -FAILTEST+=("aborts as soon as the last expected failure finishes") -FAILFILE+=("spec/rspec/core/bisect/server_spec.rb") -FAILTEST+=("aborts after an expected failure") -# 3.8.0, ignore for now -FAILFILE+=("spec/integration/bisect_runners_spec.rb") -FAILTEST+=("honors.*run_all_when_everything_filtered") -FAILFILE+=("spec/integration/bisect_runners_spec.rb") -FAILTEST+=("raises BisectFailedError") -FAILFILE+=("spec/integration/bisect_runners_spec.rb") -FAILTEST+=("runs the specs in an isolated environment") -%endif # New from 3.9.0 FAILFILE+=("spec/integration/spec_file_load_errors_spec.rb") FAILTEST+=("prints a single error when it happens") From b0ec9c6205855eeb9f016e26cd47462dceb4b238 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2019 13:22:25 +0900 Subject: [PATCH 067/126] 3.9.1 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 48dcacd..12f02cb 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,5 @@ /rubygem-rspec-core-3.8.2-full.tar.gz /rspec-core-3.9.0.gem /rubygem-rspec-core-3.9.0-full.tar.gz +/rspec-core-3.9.1.gem +/rubygem-rspec-core-3.9.1-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index af1c738..411a5a7 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.9.0 +%global majorver 3.9.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -156,6 +156,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{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 9d89be1..dafc645 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.9.0.gem) = 5ba53020970ae29b851b7524e53e20dc6668af0e16c306d239f6470c899fad44649c44fd5180c7b7614ae3e3b8c5d872cdece3f15470cb0f80076b5250c5c992 -SHA512 (rubygem-rspec-core-3.9.0-full.tar.gz) = c7f4138b6f81a4e441f316d821f972881e2be4739254b9bd51d68c35e4ca3ff1206b13be60994050d580b52f9b6dd37d6ffc7334598e16a262006493e8dd8d85 +SHA512 (rspec-core-3.9.1.gem) = b13dd0df9c8dc2fecef49e56cc5ce7d9a5d334ea741393d7ca83f36c5953d6a83ee30b5cf1b0b1c2977777499ab7b4ab98d984a20b49b3e9964c6ae47944004f +SHA512 (rubygem-rspec-core-3.9.1-full.tar.gz) = 8afdea9cdd02825be6e8177c4b0588909bcf0636aa78175aad5f7608ee544aa465c09966f1bb4500625e6d55ec774295ce1dd5fbb56eb96e9dac432311d9b1f1 From a2966a2ae7e931b4094ef1007e1ef93559ad59f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 19:17:31 +0000 Subject: [PATCH 068/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 411a5a7..f11608e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -156,6 +156,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.9.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 30 2019 amoru TASAKA - 3.9.1-1 - 3.9.1 From 95acb78e83815739bab50d0db552bc5929891ea2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 May 2020 15:48:42 +0900 Subject: [PATCH 069/126] 3.9.2 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 11 +++++++---- sources | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 12f02cb..ff42787 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,5 @@ /rubygem-rspec-core-3.9.0-full.tar.gz /rspec-core-3.9.1.gem /rubygem-rspec-core-3.9.1-full.tar.gz +/rspec-core-3.9.2.gem +/rubygem-rspec-core-3.9.2-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index f11608e..0d55613 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.9.1 +%global majorver 3.9.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -156,16 +156,19 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Sun Mar 3 2020 Mamoru TASAKA - 3.9.2-1 +- 3.9.2 + * Thu Jan 30 2020 Fedora Release Engineering - 3.9.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* 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 dafc645..8fb004e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.9.1.gem) = b13dd0df9c8dc2fecef49e56cc5ce7d9a5d334ea741393d7ca83f36c5953d6a83ee30b5cf1b0b1c2977777499ab7b4ab98d984a20b49b3e9964c6ae47944004f -SHA512 (rubygem-rspec-core-3.9.1-full.tar.gz) = 8afdea9cdd02825be6e8177c4b0588909bcf0636aa78175aad5f7608ee544aa465c09966f1bb4500625e6d55ec774295ce1dd5fbb56eb96e9dac432311d9b1f1 +SHA512 (rspec-core-3.9.2.gem) = ee16ce312b47f2537479ef6a2c77d74c982108f029faa572125c95030e75e80934c00c07e918b63c075bdf78f9e912569e6a13ad78be217682fa7d06a2efc75f +SHA512 (rubygem-rspec-core-3.9.2-full.tar.gz) = 8ce6c1c6627f46e272f8926bea48925471fbfc97a3310d241b8b7d71870b7c162da7ebd322540bd4c99c7eb433a1c4de3b859fd31edc434c8fa7b04a11f5e378 From e4e4d87b6db0b43dc2e3d26646a4670ac5064918 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 May 2020 21:45:03 +0900 Subject: [PATCH 070/126] Enable cucumber test --- rubygem-rspec-core.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 0d55613..230e86d 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -42,6 +42,8 @@ BuildRequires: rubygem(rr) BuildRequires: rubygem(coderay) BuildRequires: rubygem(thread_order) BuildRequires: git +# New test +BuildRequires: rubygem(cucumber) %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: glibc-langpack-en @@ -134,6 +136,15 @@ sed -i.warn lib/rspec/core/configuration_options.rb \ ruby -rrubygems -Ilib/ -S exe/rspec || \ ruby -rrubygems -Ilib/ -S exe/rspec --tag ~broken +# Mark failing test as broken +sed -i features/core_standalone.feature \ + -e 's|@unsupported-on-rbx|@unsupported-on-rbx @broken|' +sed -i features/command_line/init.feature \ + -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' + +env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ + env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ --tag "not @broken" + mv lib/rspec/core/configuration_options.rb{.warn,} %endif @@ -156,7 +167,10 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog -* Sun Mar 3 2020 Mamoru TASAKA - 3.9.2-1 +* Sun May 3 2020 Mamoru TASAKA - 3.9.2-2 +- Enable cucumber test + +* Sun May 3 2020 Mamoru TASAKA - 3.9.2-1 - 3.9.2 * Thu Jan 30 2020 Fedora Release Engineering - 3.9.1-1.1 From 940698fb0cb91eeb76eedea8379882a788bbd966 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 May 2020 22:08:14 +0900 Subject: [PATCH 071/126] add more BR --- rubygem-rspec-core.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 230e86d..b20298c 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -44,6 +44,7 @@ BuildRequires: rubygem(thread_order) BuildRequires: git # New test BuildRequires: rubygem(cucumber) +BuildRequires: rubygem(test-unit) %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: glibc-langpack-en From 9bdeae148e6ecb10e7498b92b2a3fc9413a79255 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 07:00:09 +0000 Subject: [PATCH 072/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index b20298c..c9e4844 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -168,6 +168,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.9.2-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun May 3 2020 Mamoru TASAKA - 3.9.2-2 - Enable cucumber test From 473a7809ec432ca208e8a3e17e52f5d20e80dee4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 14 Oct 2020 11:38:21 +0900 Subject: [PATCH 073/126] 3.9.3 --- rubygem-rspec-core.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index c9e4844..2413c41 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.9.2 +%global majorver 3.9.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -143,8 +143,12 @@ sed -i features/core_standalone.feature \ sed -i features/command_line/init.feature \ -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' +# skip-when-diff-lcs-1.3 tests are introduced on 3.9.3 env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ - env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ --tag "not @broken" + env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ \ + --tag "not @broken" \ + --tag "not @skip-when-diff-lcs-1.3" \ + %{nil} mv lib/rspec/core/configuration_options.rb{.warn,} @@ -168,6 +172,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Wed Oct 14 2020 Mamoru TASAKA - 3.9.3-1 +- 3.9.3 + * Wed Jul 29 2020 Fedora Release Engineering - 3.9.2-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8869c098288cd26b8277d248758464a20da391cd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 14 Oct 2020 11:39:09 +0900 Subject: [PATCH 074/126] 3.9.3 --- .gitignore | 2 ++ sources | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ff42787..e410bdd 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ /rubygem-rspec-core-3.9.1-full.tar.gz /rspec-core-3.9.2.gem /rubygem-rspec-core-3.9.2-full.tar.gz +/rspec-core-3.9.3.gem +/rubygem-rspec-core-3.9.3-full.tar.gz diff --git a/sources b/sources index 8fb004e..34760f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.9.2.gem) = ee16ce312b47f2537479ef6a2c77d74c982108f029faa572125c95030e75e80934c00c07e918b63c075bdf78f9e912569e6a13ad78be217682fa7d06a2efc75f -SHA512 (rubygem-rspec-core-3.9.2-full.tar.gz) = 8ce6c1c6627f46e272f8926bea48925471fbfc97a3310d241b8b7d71870b7c162da7ebd322540bd4c99c7eb433a1c4de3b859fd31edc434c8fa7b04a11f5e378 +SHA512 (rspec-core-3.9.3.gem) = ef76cde69f3628cf88b40f12e86973754667c633b67917bbf2b523dbc02f7492cbf85145097463b831cac56e3a0446f4e38d8b5ca35753b8baec0d32af4f449b +SHA512 (rubygem-rspec-core-3.9.3-full.tar.gz) = a9e5dffaea1827247ebb28b440194e5ae794908feac780df1fbfa1879eb27aac9883ff4d9cf3ffc50ea9f47f9a63f05239c35877b8fcf00553a2d97ceb863e18 From b4d156aba5def5549047af3ccd8cf1c53c7b1fa5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 14 Oct 2020 11:39:53 +0900 Subject: [PATCH 075/126] fix release --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 2413c41..5735f29 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: Rspec-2 runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks From ae59d04825662289fcacd74c9bc5687bf7059863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 14 Oct 2020 15:38:37 +0200 Subject: [PATCH 076/126] Refresh the Summary and Description. --- rubygem-rspec-core.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 5735f29..9d5b2e6 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -15,7 +15,7 @@ %undefine __brp_mangle_shebangs -Summary: Rspec-2 runner and formatters +Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} @@ -62,7 +62,7 @@ Requires: rubygem(rake) BuildArch: noarch %description -Behaviour Driven Development for Ruby. +Behaviour Driven Development for Ruby. RSpec runner and example groups. %package doc Summary: Documentation for %{name} From d52086caa5e7e4f765914d29316de7c41e41f217 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 11 Dec 2020 14:44:20 +0900 Subject: [PATCH 077/126] 3.10.0 Once disable test for bootstrap --- .gitignore | 2 ++ rubygem-rspec-core.spec | 15 ++++++++++++--- sources | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e410bdd..050fc63 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ /rubygem-rspec-core-3.9.2-full.tar.gz /rspec-core-3.9.3.gem /rubygem-rspec-core-3.9.3-full.tar.gz +/rspec-core-3.10.0.gem +/rubygem-rspec-core-3.10.0-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 9d5b2e6..46ee459 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.9.3 +%global majorver 3.10.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 0.1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %undefine __brp_mangle_shebangs @@ -171,7 +171,16 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %files 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 Oct 14 2020 Mamoru TASAKA - 3.9.3-1 - 3.9.3 diff --git a/sources b/sources index 34760f4..1821954 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.9.3.gem) = ef76cde69f3628cf88b40f12e86973754667c633b67917bbf2b523dbc02f7492cbf85145097463b831cac56e3a0446f4e38d8b5ca35753b8baec0d32af4f449b -SHA512 (rubygem-rspec-core-3.9.3-full.tar.gz) = a9e5dffaea1827247ebb28b440194e5ae794908feac780df1fbfa1879eb27aac9883ff4d9cf3ffc50ea9f47f9a63f05239c35877b8fcf00553a2d97ceb863e18 +SHA512 (rspec-core-3.10.0.gem) = 38f11cad8d3fe31d5a1b1539c82211ec704efabfc42ac1c2da2b3e110fab047576b4f51618bf917df162c766d31a56155b34732116b90d9a5c93efd1ddf82eb6 +SHA512 (rubygem-rspec-core-3.10.0-full.tar.gz) = 41ac3be87e90d2fe61b6c7ba17f186864c9908ceb33748802272adf6f5ffb03e01a0c2a2655b70396da25dba5d72d2df8a59be7440ec5dc1040254cb2b5f06f5 From 131231b2e0ea93f19ba8e1a09f274233b28ce8f5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 11 Dec 2020 15:30:39 +0900 Subject: [PATCH 078/126] Enable tests again --- rubygem-rspec-core.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 46ee459..a6fafc6 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 0.1 +%global fedorarel 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %undefine __brp_mangle_shebangs @@ -171,12 +171,10 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %files 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 f9d9b5b42721c0a9eff24d1f8f248a6801d1543d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 29 Dec 2020 15:15:29 +0900 Subject: [PATCH 079/126] 3.10.1 --- .gitignore | 2 ++ rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 050fc63..bfb6406 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,5 @@ /rubygem-rspec-core-3.9.3-full.tar.gz /rspec-core-3.10.0.gem /rubygem-rspec-core-3.10.0-full.tar.gz +/rspec-core-3.10.1.gem +/rubygem-rspec-core-3.10.1-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index a6fafc6..67e8909 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.10.0 +%global majorver 3.10.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -172,6 +172,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{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 1821954..b5f9982 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.10.0.gem) = 38f11cad8d3fe31d5a1b1539c82211ec704efabfc42ac1c2da2b3e110fab047576b4f51618bf917df162c766d31a56155b34732116b90d9a5c93efd1ddf82eb6 -SHA512 (rubygem-rspec-core-3.10.0-full.tar.gz) = 41ac3be87e90d2fe61b6c7ba17f186864c9908ceb33748802272adf6f5ffb03e01a0c2a2655b70396da25dba5d72d2df8a59be7440ec5dc1040254cb2b5f06f5 +SHA512 (rspec-core-3.10.1.gem) = 46808d37736b5f30d562b4014638cbf2d1a7d7432730c6c727a6e539f63ee21a04185610034fff4d938a948a887ba6a626955963add6b5e9b5f64499732d742a +SHA512 (rubygem-rspec-core-3.10.1-full.tar.gz) = 50557bc17f7f47986d5770d02c85536a44666f6eafed168df41740fcfa4ded5ee5d11a933d2d25614a532948c91cb5ebdc7eaf45b5e8c7f792870eb203e00527 From bf7eedcab7a5b419d9e3702adf2084335a62a9bf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 26 Jan 2021 11:50:33 +0900 Subject: [PATCH 080/126] Ruby 3.0: Disable failing cucumber suite for now --- rubygem-rspec-core.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 67e8909..a07906e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -74,6 +74,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 +#%%patch1 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -143,6 +144,11 @@ sed -i features/core_standalone.feature \ sed -i features/command_line/init.feature \ -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' +# From ruby 3, once disabling +%if 0%{?fedora} >= 34 +mv features/command_line/warnings_option.feature{,.drop} +%endif + # skip-when-diff-lcs-1.3 tests are introduced on 3.9.3 env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ \ @@ -152,6 +158,11 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ mv lib/rspec/core/configuration_options.rb{.warn,} +%if 0%{?fedora} >= 34 +mv features/command_line/warnings_option.feature{.drop,} + +%endif + %endif %files @@ -172,6 +183,9 @@ mv lib/rspec/core/configuration_options.rb{.warn,} %{gem_docdir} %changelog +* Tue Jan 26 2021 Mamoru TASAKA - 3.10.1-2 +- Ruby 3.0: Disable failing cucumber suite for now + * Tue Dec 29 2020 Mamoru TASAKA - 3.10.1-1 - 3.10.1 From 190fb4d37ddf57aaf195ae1094dc338748fd2795 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 17 Feb 2021 16:51:39 +0900 Subject: [PATCH 081/126] rr 1.2.1: Disable failing cucumber suite for now --- rubygem-rspec-core.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index a07906e..3779c64 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 3 %global gem_name rspec-core @@ -145,8 +145,15 @@ sed -i features/command_line/init.feature \ -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' # From ruby 3, once disabling +# disabling tests failing with rr 1.2.1 %if 0%{?fedora} >= 34 -mv features/command_line/warnings_option.feature{,.drop} +for f in \ + features/command_line/warnings_option.feature \ + features/mock_framework_integration/use_rr.feature \ + %{nil} +do + mv $f ${f}.drop +done %endif # skip-when-diff-lcs-1.3 tests are introduced on 3.9.3 @@ -159,8 +166,13 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ mv lib/rspec/core/configuration_options.rb{.warn,} %if 0%{?fedora} >= 34 -mv features/command_line/warnings_option.feature{.drop,} - +for f in \ + features/command_line/warnings_option.feature \ + features/mock_framework_integration/use_rr.feature \ + %{nil} +do + mv ${f}.drop ${f} +done %endif %endif @@ -183,6 +195,9 @@ mv features/command_line/warnings_option.feature{.drop,} %{gem_docdir} %changelog +* Wed Feb 17 2021 Mamoru TASAKA - 3.10.1-3 +- rr 1.2.1: Disable failing cucumber suite for now + * Tue Jan 26 2021 Mamoru TASAKA - 3.10.1-2 - Ruby 3.0: Disable failing cucumber suite for now From b7fcc5214d1f7cdc380666daaef8abd65dbcd4e6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Feb 2021 17:09:20 +0900 Subject: [PATCH 082/126] add conditional for eln, to shut down build failure automatically evoked so many time... --- rubygem-rspec-core.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 3779c64..20c18cf 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 4 %global gem_name rspec-core @@ -146,7 +146,7 @@ sed -i features/command_line/init.feature \ # From ruby 3, once disabling # disabling tests failing with rr 1.2.1 -%if 0%{?fedora} >= 34 +%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ features/command_line/warnings_option.feature \ features/mock_framework_integration/use_rr.feature \ @@ -165,7 +165,7 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ mv lib/rspec/core/configuration_options.rb{.warn,} -%if 0%{?fedora} >= 34 +%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ features/command_line/warnings_option.feature \ features/mock_framework_integration/use_rr.feature \ @@ -195,6 +195,9 @@ done %{gem_docdir} %changelog +* Sun Feb 28 2021 Mamoru TASAKA - 3.10.1-4 +- Add conditional for eln + * Wed Feb 17 2021 Mamoru TASAKA - 3.10.1-3 - rr 1.2.1: Disable failing cucumber suite for now From eb160dab1204d221c567d772d62412169b2f2a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 18 Mar 2021 16:31:02 +0100 Subject: [PATCH 083/126] Make test suite green. --- ...0.1-Filter-content-of-usr-share-ruby.patch | 28 +++++++++ rubygem-rspec-core.spec | 61 ++++--------------- 2 files changed, 40 insertions(+), 49 deletions(-) create mode 100644 rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch diff --git a/rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch b/rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch new file mode 100644 index 0000000..fa7e8ac --- /dev/null +++ b/rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch @@ -0,0 +1,28 @@ +From 7550f7b024323c15ed21d13e930f59a64455e5d1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Thu, 18 Mar 2021 15:45:48 +0100 +Subject: [PATCH] Filter content of /usr/share/ruby + +Some Linux distributions, such as Fedora, are using this location to +store Ruby StdLib. Therefore, it would be nice to filter this location +similarly to /lib\d*/ruby/ +--- + lib/rspec/core/backtrace_formatter.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/rspec/core/backtrace_formatter.rb b/lib/rspec/core/backtrace_formatter.rb +index e0bee52a..27008e2c 100644 +--- a/lib/rspec/core/backtrace_formatter.rb ++++ b/lib/rspec/core/backtrace_formatter.rb +@@ -8,7 +8,7 @@ module RSpec + def initialize + @full_backtrace = false + +- patterns = %w[ /lib\d*/ruby/ bin/ exe/rspec /lib/bundler/ /exe/bundle: ] ++ patterns = %w[ /lib\d*/ruby/ /share/ruby/ bin/ exe/rspec /lib/bundler/ /exe/bundle: ] + patterns << "org/jruby/" if RUBY_PLATFORM == 'java' + patterns.map! { |s| Regexp.new(s.gsub("/", File::SEPARATOR)) } + +-- +2.30.0 + diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 20c18cf..77cc9d4 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 4 +%global fedorarel 5 %global gem_name rspec-core @@ -26,6 +26,9 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh +# Adjust backtrace filter for Fedora placement of StdLib. +# https://github.com/rspec/rspec-core/pull/2881 +Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -74,7 +77,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 -#%%patch1 -p1 +%patch0 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -91,52 +94,11 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %if 0%{?need_bootstrap_set} < 1 %check LANG=C.UTF-8 -# Test failure needs investigation... -# perhaps due to some incompatibility between libxml2 2.9.x -# and rubygem-nokogiri +# Adjust the backtrace filters to our directory layout. +sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ + spec/integration/{suite_hooks_errors,spec_file_load_errors}_spec.rb -FAILFILE=() -FAILTEST=() -FAILFILE+=("spec/rspec/core/formatters/progress_formatter_spec.rb") -FAILTEST+=("produces the expected full output") -FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb") -FAILTEST+=("produces the expected full output") -#FAILFILE+=("spec/rspec/core/formatters/syntax_highlighter_spec.rb") -#FAILTEST+=("when CodeRay is available") -# New from 3.5.3 -FAILFILE+=("spec/integration/suite_hooks_errors_spec.rb") -FAILTEST+=("nicely formats errors") -# New from 3.6.0 -FAILFILE+=("spec/integration/spec_file_load_errors_spec.rb") -FAILTEST+=("nicely handles load-time errors") -# NET?? -FAILFILE+=("spec/rspec/core/runner_spec.rb") -FAILTEST+=("if drb server is started with 127.0.0.1") -FAILFILE+=("spec/rspec/core/runner_spec.rb") -FAILTEST+=("if drb server is started with localhost") -# New from 3.9.0 -FAILFILE+=("spec/integration/spec_file_load_errors_spec.rb") -FAILTEST+=("prints a single error when it happens") - -for ((i = 0; i < ${#FAILFILE[@]}; i++)) { - sed -i \ - -e "\@${FAILTEST[$i]}@s|do$|, :broken => true do|" \ - ${FAILFILE[$i]} -} - - -# Well, when HOME variable is not set and tty is not a real one -# but pseudo-tty, with current ruby implementation $ env -i ruby -e 'p Dir.home' -# causes: -# `home': couldn't find login name -- expanding `~' (ArgumentError) -# - and this causes some test errors on rspec-core. -# fixing this error without modifying rspec-core "code" is very hard, -# once modifying source itself. -sed -i.warn lib/rspec/core/configuration_options.rb \ - -e '\@because the HOME environment variable is not set@s|RSpec\.warning|#RSpec.warning|' - -ruby -rrubygems -Ilib/ -S exe/rspec || \ - ruby -rrubygems -Ilib/ -S exe/rspec --tag ~broken +ruby -rrubygems -Ilib/ -S exe/rspec # Mark failing test as broken sed -i features/core_standalone.feature \ @@ -163,8 +125,6 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ --tag "not @skip-when-diff-lcs-1.3" \ %{nil} -mv lib/rspec/core/configuration_options.rb{.warn,} - %if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ features/command_line/warnings_option.feature \ @@ -195,6 +155,9 @@ done %{gem_docdir} %changelog +* Thu Mar 18 2021 Vít Ondruch - 3.10.1-5 +- Make test suite green. + * Sun Feb 28 2021 Mamoru TASAKA - 3.10.1-4 - Add conditional for eln From 5b507733ac6be2ede3bdf622baa494edd233f30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 18 Mar 2021 17:13:05 +0100 Subject: [PATCH 084/126] Drop Nokogiri dependency. It does not appear to be used anywhere. --- rubygem-rspec-core.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 77cc9d4..696ffd8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -34,7 +34,6 @@ Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch BuildRequires: rubygems-devel %if 0%{?need_bootstrap_set} < 1 BuildRequires: rubygem(minitest) -BuildRequires: rubygem(nokogiri) BuildRequires: rubygem(rake) BuildRequires: rubygem(rspec) BuildRequires: rubygem(aruba) From 4bceaf8eda7add9cecce8a7b8c836af348d8ab90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 19 Mar 2021 15:02:26 +0100 Subject: [PATCH 085/126] Polish the cucumber test suite. --- rubygem-rspec-core.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 696ffd8..1e6c85a 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -100,16 +100,13 @@ sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ ruby -rrubygems -Ilib/ -S exe/rspec # Mark failing test as broken -sed -i features/core_standalone.feature \ - -e 's|@unsupported-on-rbx|@unsupported-on-rbx @broken|' sed -i features/command_line/init.feature \ - -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' + -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' -# From ruby 3, once disabling -# disabling tests failing with rr 1.2.1 %if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ - features/command_line/warnings_option.feature \ + `# disabling tests failing with rr 1.2.1` \ + `# https://github.com/rspec/rspec-core/issues/2882` \ features/mock_framework_integration/use_rr.feature \ %{nil} do @@ -117,16 +114,20 @@ do done %endif -# skip-when-diff-lcs-1.3 tests are introduced on 3.9.3 -env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \ - env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ \ +# Setup just right amount of paths to make the tests suite run. +export RUBYOPT="-I$(pwd)/lib:$(ruby -e 'puts %w[rspec/support minitest test/unit].map {|r| Gem::Specification.find_by_path(r).full_require_paths}.join(?:)')" +cucumber -v -f pretty features/ || \ + cucumber -v -f pretty features/ \ --tag "not @broken" \ + `# Explicitly skip 'skip-when-diff-lcs-1.3' and '@ruby-2-7' test cases. While` \ + `# the conditions are correctly detected, the 'warning' called instead their` \ + `# execution is troublesome, possibly due to upstream using old Cucumber?` \ --tag "not @skip-when-diff-lcs-1.3" \ + --tag "not @ruby-2-7" \ %{nil} %if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 for f in \ - features/command_line/warnings_option.feature \ features/mock_framework_integration/use_rr.feature \ %{nil} do From fb330069ff5e93e853c53fc62a62314fec87ee8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 12:37:27 +0000 Subject: [PATCH 086/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 1e6c85a..3744e77 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -155,6 +155,9 @@ done %{gem_docdir} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.10.1-5.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 18 2021 Vít Ondruch - 3.10.1-5 - Make test suite green. From b1e371f3020839b011e880cc04d4e27214fa2829 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Jan 2022 19:49:58 +0900 Subject: [PATCH 087/126] Add some workaround for aruba 2 / cucumber 7 / diff-lcs 1.5 --- rubygem-rspec-core.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 3744e77..ee6c19f 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 5 +%global fedorarel 6 %global gem_name rspec-core @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -97,7 +97,7 @@ LANG=C.UTF-8 sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ spec/integration/{suite_hooks_errors,spec_file_load_errors}_spec.rb -ruby -rrubygems -Ilib/ -S exe/rspec +ruby -Ilib -S exe/rspec # Mark failing test as broken sed -i features/command_line/init.feature \ @@ -114,8 +114,15 @@ do done %endif +# cucumber 7.0.0 does not support ~@ +sed -i cucumber.yml -e "s|~@wip|'not @wip'|" +sed -i features/support/require_expect_syntax_in_aruba_specs.rb -e 's|~@|not @|g' +# Perhaps with cucumber 7.0.0 change? (along with diff-lcs updated to 1.5) +sed -i features/support/diff_lcs_versions.rb -e 's|scenario.title|scenario.name|' + # Setup just right amount of paths to make the tests suite run. export RUBYOPT="-I$(pwd)/lib:$(ruby -e 'puts %w[rspec/support minitest test/unit].map {|r| Gem::Specification.find_by_path(r).full_require_paths}.join(?:)')" +export CUCUMBER_PUBLISH_QUIET=true cucumber -v -f pretty features/ || \ cucumber -v -f pretty features/ \ --tag "not @broken" \ @@ -123,6 +130,10 @@ cucumber -v -f pretty features/ || \ `# the conditions are correctly detected, the 'warning' called instead their` \ `# execution is troublesome, possibly due to upstream using old Cucumber?` \ --tag "not @skip-when-diff-lcs-1.3" \ +%if 0%{?fedora} >= 36 + `# Cucumber 7 upgrades diff-lcs to 1.5` \ + --tag "not @skip-when-diff-lcs-1.4" \ +%endif --tag "not @ruby-2-7" \ %{nil} @@ -155,6 +166,9 @@ done %{gem_docdir} %changelog +* Fri Jan 14 2022 Mamoru TASAKA - 3.10.1-6 +- Add some workaround for aruba 2 / cucumber 7 / diff-lcs 1.5 + * Fri Jul 23 2021 Fedora Release Engineering - 3.10.1-5.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 490e7cfdd5fdd6a1e0dd33f543c839d3f48a4015 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 19:10:57 +0000 Subject: [PATCH 088/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index ee6c19f..f8b3565 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -166,6 +166,9 @@ done %{gem_docdir} %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.10.1-6.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 Mamoru TASAKA - 3.10.1-6 - Add some workaround for aruba 2 / cucumber 7 / diff-lcs 1.5 From 15e3de8d5ccf32c7199d9f39e45d536fa6159a48 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 10:45:29 +0900 Subject: [PATCH 089/126] vondruch: Use weak dependency for Rake --- rubygem-rspec-core.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index f8b3565..6f4fffd 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -53,9 +53,13 @@ BuildRequires: glibc-langpack-en %endif %endif -# Make the following installed by default +# Make the following dependency optionally installed # lib/rspec/core/rake_task +%if 0%{?fedora} >= 36 +Recommends: rubygem(rake) +%else Requires: rubygem(rake) +%endif # Optional #Requires: rubygem(ZenTest) #Requires: rubygem(flexmock) @@ -166,6 +170,9 @@ done %{gem_docdir} %changelog +* Fri Jan 28 2021 Vít Ondruch +- Use weak dependency for Rake. + * Fri Jan 21 2022 Fedora Release Engineering - 3.10.1-6.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From dac52cb61d7fc51f3871bb5dc60dd083e9ff576a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 11:02:07 +0900 Subject: [PATCH 090/126] 3.10.2 --- .gitignore | 69 ++--------------------------------------- rubygem-rspec-core.spec | 9 ++++-- 2 files changed, 8 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index bfb6406..b9f8553 100644 --- a/.gitignore +++ b/.gitignore @@ -1,67 +1,2 @@ -/rspec-core-2.5.1.gem -/rspec-core-2.6.0.rc4.gem -/rspec-core-2.6.0.rc6.gem -/rspec-core-2.6.0.gem -/rspec-core-2.6.2.gem -/rspec-core-2.6.3.gem -/rspec-core-2.6.4.gem -/rspec-core-2.8.0.gem -/rspec-core-2.11.1.gem -/rspec-core-2.12.2.gem -/rspec-core-2.13.1.gem -/rspec-core-2.14.5.gem -/rspec-core-2.14.6.gem -/rspec-core-2.14.7.gem -/rspec-core-2.14.8.gem -/rspec-core-3.1.7.gem -/rubygem-rspec-core-3.1.7-full.tar.gz -/rspec-core-3.2.0.gem -/rubygem-rspec-core-3.2.0-full.tar.gz -/rspec-core-3.2.1.gem -/rubygem-rspec-core-3.2.1-full.tar.gz -/rspec-core-3.2.2.gem -/rubygem-rspec-core-3.2.2-full.tar.gz -/rspec-core-3.2.3.gem -/rubygem-rspec-core-3.2.3-full.tar.gz -/rspec-core-3.3.2.gem -/rubygem-rspec-core-3.3.2-full.tar.gz -/rspec-core-3.4.1.gem -/rubygem-rspec-core-3.4.1-full.tar.gz -/rspec-core-3.4.2.gem -/rubygem-rspec-core-3.4.2-full.tar.gz -/rspec-core-3.4.3.gem -/rubygem-rspec-core-3.4.3-full.tar.gz -/rspec-core-3.4.4.gem -/rubygem-rspec-core-3.4.4-full.tar.gz -/rspec-core-3.5.1.gem -/rubygem-rspec-core-3.5.1-full.tar.gz -/rspec-core-3.5.2.gem -/rubygem-rspec-core-3.5.2-full.tar.gz -/rspec-core-3.5.3.gem -/rubygem-rspec-core-3.5.3-full.tar.gz -/rspec-core-3.5.4.gem -/rubygem-rspec-core-3.5.4-full.tar.gz -/rspec-core-3.6.0.gem -/rubygem-rspec-core-3.6.0-full.tar.gz -/rspec-core-3.7.0.gem -/rubygem-rspec-core-3.7.0-full.tar.gz -/rspec-core-3.7.1.gem -/rubygem-rspec-core-3.7.1-full.tar.gz -/rspec-core-3.8.0.gem -/rubygem-rspec-core-3.8.0-full.tar.gz -/rspec-core-3.8.1.gem -/rubygem-rspec-core-3.8.1-full.tar.gz -/rspec-core-3.8.2.gem -/rubygem-rspec-core-3.8.2-full.tar.gz -/rspec-core-3.9.0.gem -/rubygem-rspec-core-3.9.0-full.tar.gz -/rspec-core-3.9.1.gem -/rubygem-rspec-core-3.9.1-full.tar.gz -/rspec-core-3.9.2.gem -/rubygem-rspec-core-3.9.2-full.tar.gz -/rspec-core-3.9.3.gem -/rubygem-rspec-core-3.9.3-full.tar.gz -/rspec-core-3.10.0.gem -/rubygem-rspec-core-3.10.0-full.tar.gz -/rspec-core-3.10.1.gem -/rubygem-rspec-core-3.10.1-full.tar.gz +/rspec-core-*.gem +/rubygem-rspec-core-*-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 6f4fffd..3f6df0e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.10.1 +%global majorver 3.10.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 6 +%global fedorarel 1 %global gem_name rspec-core @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -170,6 +170,9 @@ done %{gem_docdir} %changelog +* Fri Jan 28 2021 Mamoru TASAKA - 3.10.2-1 +- 3.10.2 + * Fri Jan 28 2021 Vít Ondruch - Use weak dependency for Rake. From b77cdbbdac0ee1e7e89d331f0a287a1b227fab1d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 11:03:23 +0900 Subject: [PATCH 091/126] upload source --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b5f9982..5a68b1e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.10.1.gem) = 46808d37736b5f30d562b4014638cbf2d1a7d7432730c6c727a6e539f63ee21a04185610034fff4d938a948a887ba6a626955963add6b5e9b5f64499732d742a -SHA512 (rubygem-rspec-core-3.10.1-full.tar.gz) = 50557bc17f7f47986d5770d02c85536a44666f6eafed168df41740fcfa4ded5ee5d11a933d2d25614a532948c91cb5ebdc7eaf45b5e8c7f792870eb203e00527 +SHA512 (rspec-core-3.10.2.gem) = ce35b247be7b5cc656febda685021f18b5e752b865d8815ac4ac1fd1de05b3d7f8bca97c8183afa5395f0acf59a0725037ecd887e319f566a0b1d55140d2119c +SHA512 (rubygem-rspec-core-3.10.2-full.tar.gz) = 6329fc1de12f7044201d4cc5170e50d6342b3ec9c4ccbbb5dba01edbf556f20467b2a41a2578e28b71b375dde512bc9a7b5088785abe0a5f2f297007e68624f9 From b29f846a30c22cda852881b89b2a7cc29535e7ee Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 11:09:00 +0900 Subject: [PATCH 092/126] fix year --- rubygem-rspec-core.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 3f6df0e..c734a64 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -170,10 +170,10 @@ done %{gem_docdir} %changelog -* Fri Jan 28 2021 Mamoru TASAKA - 3.10.2-1 +* Fri Jan 28 2022 Mamoru TASAKA - 3.10.2-1 - 3.10.2 -* Fri Jan 28 2021 Vít Ondruch +* Fri Jan 28 2022 Vít Ondruch - Use weak dependency for Rake. * Fri Jan 21 2022 Fedora Release Engineering - 3.10.1-6.1 From c0be2aa6eaaa7099248826ca12e2a8d036c81cf8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jan 2022 13:14:03 +0900 Subject: [PATCH 093/126] Disable test failing on ruby31 for now --- rubygem-rspec-core.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index c734a64..f4b6138 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -101,6 +101,10 @@ LANG=C.UTF-8 sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ spec/integration/{suite_hooks_errors,spec_file_load_errors}_spec.rb +# ruby3.1: output format change, disabling for now +sed -i spec/integration/spec_file_load_errors_spec.rb \ + -e '\@nicely handles load-time errors in user spec files@s| it | xit |' + ruby -Ilib -S exe/rspec # Mark failing test as broken @@ -170,6 +174,9 @@ done %{gem_docdir} %changelog +* Fri Jan 28 2022 Mamoru TASAKA - 3.10.2-2 +- Disable test failing on ruby31 for now + * Fri Jan 28 2022 Mamoru TASAKA - 3.10.2-1 - 3.10.2 From 35c7273f1ae095a76499b4a04e8d535088d0315d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 10 Feb 2022 12:32:21 +0900 Subject: [PATCH 094/126] 3.11.0 --- rubygem-rspec-core.spec | 13 ++++++++----- sources | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index f4b6138..3da0a19 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.10.2 +%global majorver 3.11.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%global need_bootstrap_set 0 +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -32,7 +32,7 @@ Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel -%if 0%{?need_bootstrap_set} < 1 +%if %{without bootstrap} BuildRequires: rubygem(minitest) BuildRequires: rubygem(rake) BuildRequires: rubygem(rspec) @@ -94,8 +94,8 @@ cp -a .%{_prefix}/* %{buildroot}%{_prefix}/ # cleanups rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} -%if 0%{?need_bootstrap_set} < 1 %check +%if %{without bootstrap} LANG=C.UTF-8 # Adjust the backtrace filters to our directory layout. sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ @@ -174,6 +174,9 @@ done %{gem_docdir} %changelog +* Thu Feb 10 2022 Mamoru TASAKA - 3.11.0-1 +- 3.11.0 + * Fri Jan 28 2022 Mamoru TASAKA - 3.10.2-2 - Disable test failing on ruby31 for now diff --git a/sources b/sources index 5a68b1e..ee80b34 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.10.2.gem) = ce35b247be7b5cc656febda685021f18b5e752b865d8815ac4ac1fd1de05b3d7f8bca97c8183afa5395f0acf59a0725037ecd887e319f566a0b1d55140d2119c -SHA512 (rubygem-rspec-core-3.10.2-full.tar.gz) = 6329fc1de12f7044201d4cc5170e50d6342b3ec9c4ccbbb5dba01edbf556f20467b2a41a2578e28b71b375dde512bc9a7b5088785abe0a5f2f297007e68624f9 +SHA512 (rspec-core-3.11.0.gem) = 2cec4af0ac69776a4846ef93e98f5459e346b22b9f118aa3fb65c71b8fcecd3d6d156ffba0a6509fb11c9d9e3d88badcece23055e4f3ea0f4ef6e867372fc9b9 +SHA512 (rubygem-rspec-core-3.11.0-full.tar.gz) = b21894403df5bdb7a0456b490cf69c42ecdda54a3dcfd64f91d2ca7d63a339e1b08f595bfa8612ce49f718db526f63acda44bff11ae13a58ba8edfe0cacdcfdc From 667932f2401612c24b3f2b0425bb3785b3c1b7f6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 10 Feb 2022 13:23:49 +0900 Subject: [PATCH 095/126] kill bootstrap --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 3da0a19..51f183e 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 2944f7f50ae0a15c5a7e97cd4b431222c41497a9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Jun 2022 12:27:33 +0900 Subject: [PATCH 096/126] Specify seed for rspec to avoid random failure for now --- rubygem-rspec-core.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 51f183e..70f16ea 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -105,7 +105,8 @@ sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ sed -i spec/integration/spec_file_load_errors_spec.rb \ -e '\@nicely handles load-time errors in user spec files@s| it | xit |' -ruby -Ilib -S exe/rspec +# FIXME seed 33413 sees test failure +ruby -Ilib -S exe/rspec --seed 1 #33413 # Mark failing test as broken sed -i features/command_line/init.feature \ @@ -131,8 +132,8 @@ sed -i features/support/diff_lcs_versions.rb -e 's|scenario.title|scenario.name| # Setup just right amount of paths to make the tests suite run. export RUBYOPT="-I$(pwd)/lib:$(ruby -e 'puts %w[rspec/support minitest test/unit].map {|r| Gem::Specification.find_by_path(r).full_require_paths}.join(?:)')" export CUCUMBER_PUBLISH_QUIET=true -cucumber -v -f pretty features/ || \ - cucumber -v -f pretty features/ \ +cucumber -v -f progress features/ || \ + cucumber -v -f progress features/ \ --tag "not @broken" \ `# Explicitly skip 'skip-when-diff-lcs-1.3' and '@ruby-2-7' test cases. While` \ `# the conditions are correctly detected, the 'warning' called instead their` \ @@ -174,6 +175,9 @@ done %{gem_docdir} %changelog +* Mon Jun 6 2022 Mamoru TASAKA - 3.11.0-2 +- Specify seed for rspec to avoid random failure for now + * Thu Feb 10 2022 Mamoru TASAKA - 3.11.0-1 - 3.11.0 From 3d3ffc664307bf24f1e203fbb678779d21eb831c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 02:12:59 +0000 Subject: [PATCH 097/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 70f16ea..b3d3ead 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 License: MIT URL: http://github.com/rspec/rspec-mocks @@ -175,6 +175,9 @@ done %{gem_docdir} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 6 2022 Mamoru TASAKA - 3.11.0-2 - Specify seed for rspec to avoid random failure for now From e7531e5398dc0d81fbcdcb9c7b26fb83e009a2e0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 Sep 2022 23:06:37 +0900 Subject: [PATCH 098/126] Backport upstream fix to eliminate Fixnum usage removed on Ruby 3.2 --- rubygem-rspec-core.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index b3d3ead..33c922d 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 3 %global gem_name rspec-core @@ -18,7 +18,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks @@ -83,6 +83,11 @@ This package contains documentation for %{name}. %patch0 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec +# https://github.com/ruby/ruby/blob/28840d74c26189f4e730b906c2383e32ea6165fe/NEWS.md?plain=1#L232 +# https://github.com/rspec/rspec-core/commit/bf49c78d7a92e253d557924a3f85fd6991e32ca3 +# Ruby 3.2 removes Fixnum +sed -i features/metadata/described_class.feature -e 's|Fixnum|Symbol|' + %build gem build %{gem_name}.gemspec %gem_install @@ -175,6 +180,9 @@ done %{gem_docdir} %changelog +* Thu Sep 29 2022 Mamoru TASAKA - 3.11.0-3 +- Backport upstream fix to eliminate Fixnum usage removed on Ruby 3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 81232177c09385056d38ffc54836e4b29398e80d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 15:38:32 +0900 Subject: [PATCH 099/126] 3.12.0 --- rubygem-rspec-core.spec | 16 +++++++--------- sources | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 33c922d..250fb99 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.11.0 +%global majorver 3.12.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%bcond_with bootstrap +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -83,11 +83,6 @@ This package contains documentation for %{name}. %patch0 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec -# https://github.com/ruby/ruby/blob/28840d74c26189f4e730b906c2383e32ea6165fe/NEWS.md?plain=1#L232 -# https://github.com/rspec/rspec-core/commit/bf49c78d7a92e253d557924a3f85fd6991e32ca3 -# Ruby 3.2 removes Fixnum -sed -i features/metadata/described_class.feature -e 's|Fixnum|Symbol|' - %build gem build %{gem_name}.gemspec %gem_install @@ -129,7 +124,7 @@ done %endif # cucumber 7.0.0 does not support ~@ -sed -i cucumber.yml -e "s|~@wip|'not @wip'|" +sed -i cucumber.yml -e 's|~@wip|"not @wip"|' sed -i features/support/require_expect_syntax_in_aruba_specs.rb -e 's|~@|not @|g' # Perhaps with cucumber 7.0.0 change? (along with diff-lcs updated to 1.5) sed -i features/support/diff_lcs_versions.rb -e 's|scenario.title|scenario.name|' @@ -180,6 +175,9 @@ done %{gem_docdir} %changelog +* Thu Oct 27 2022 Mamoru TASAKA - 3.12.0-1 +- 3.12.0 + * Thu Sep 29 2022 Mamoru TASAKA - 3.11.0-3 - Backport upstream fix to eliminate Fixnum usage removed on Ruby 3.2 diff --git a/sources b/sources index ee80b34..254ead7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.11.0.gem) = 2cec4af0ac69776a4846ef93e98f5459e346b22b9f118aa3fb65c71b8fcecd3d6d156ffba0a6509fb11c9d9e3d88badcece23055e4f3ea0f4ef6e867372fc9b9 -SHA512 (rubygem-rspec-core-3.11.0-full.tar.gz) = b21894403df5bdb7a0456b490cf69c42ecdda54a3dcfd64f91d2ca7d63a339e1b08f595bfa8612ce49f718db526f63acda44bff11ae13a58ba8edfe0cacdcfdc +SHA512 (rspec-core-3.12.0.gem) = b6b990fb9663474b899423da113fc590c8de990c74852e9022b026f1ea97c93a31f207fbb67e756bc20e79b539a2324ffa8ebe277b27f902619501d00beae96b +SHA512 (rubygem-rspec-core-3.12.0-full.tar.gz) = 086f5e63e288a70c2d8cb8f10a5f71b02b9a5de1fe0157016c1744d28257f5b64b188058914e7986af791a494b3efa6afdf17d1d6132bddf03d3b525561ae516 From 0e470ac484e50da18c936e411ca58b45b558a39c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 16:02:37 +0900 Subject: [PATCH 100/126] enable test again --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 250fb99..f870628 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 91ba64084bf402b532a122ef044f207c08fad376 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 19 Jan 2023 10:28:07 +0900 Subject: [PATCH 101/126] Disable GC related test, with the advice from ruby upstream --- rubygem-rspec-core.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index f870628..2b064f6 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -105,6 +105,12 @@ sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ sed -i spec/integration/spec_file_load_errors_spec.rb \ -e '\@nicely handles load-time errors in user spec files@s| it | xit |' +# ruby3.2 + compile with YJIT + LTO seems to make rspec-core GC test fail. +# disabling this, per ruby upsteram advice: +# https://bugs.ruby-lang.org/issues/19254 +sed -i spec/rspec/core/example_spec.rb \ + -e '\@defined.*RUBY_ENGINE.*truffleruby@s|^\(.*\)$|\1 \&\& false|' + # FIXME seed 33413 sees test failure ruby -Ilib -S exe/rspec --seed 1 #33413 @@ -175,6 +181,9 @@ done %{gem_docdir} %changelog +* Thu Jan 19 2023 Mamoru TASAKA - 3.12.0-2 +- Disable GC related test, with the advice from ruby upstream + * Thu Oct 27 2022 Mamoru TASAKA - 3.12.0-1 - 3.12.0 From c90c3940f344f18bcb75c37e58071e2ac85b5715 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 10 Feb 2023 14:26:20 +0900 Subject: [PATCH 102/126] 3.12.1 --- rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 2b064f6..c8e1682 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.12.0 +%global majorver 3.12.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global fedorarel 1 %global gem_name rspec-core @@ -181,6 +181,9 @@ done %{gem_docdir} %changelog +* Fri Feb 10 2023 Mamoru TASAKA - 3.12.1-1 +- 3.12.1 + * Thu Jan 19 2023 Mamoru TASAKA - 3.12.0-2 - Disable GC related test, with the advice from ruby upstream diff --git a/sources b/sources index 254ead7..0440561 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.12.0.gem) = b6b990fb9663474b899423da113fc590c8de990c74852e9022b026f1ea97c93a31f207fbb67e756bc20e79b539a2324ffa8ebe277b27f902619501d00beae96b -SHA512 (rubygem-rspec-core-3.12.0-full.tar.gz) = 086f5e63e288a70c2d8cb8f10a5f71b02b9a5de1fe0157016c1744d28257f5b64b188058914e7986af791a494b3efa6afdf17d1d6132bddf03d3b525561ae516 +SHA512 (rspec-core-3.12.1.gem) = 986d19437c223511293094c0ad041d565cb78cdb5ecce0995bac963b9c27a4b346d914c7625ba4a6021cd8c64b8218aaf0788ce617b05adeb0f889565191e8c2 +SHA512 (rubygem-rspec-core-3.12.1-full.tar.gz) = 9cbce3e06d7645e16ea78944e4be32adae134f9037951232d72fa6d7e4140285737e49e0c494a076bf479cebccbfdf2fb1321156fe1821ee1404dd2d335bf2ba From f3fc1e2f77715e2a81f5db55db567ace98f3826b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 3 Mar 2023 13:54:34 -0500 Subject: [PATCH 103/126] Disable unwanted dependencies in RHEL builds --- rubygem-rspec-core.spec | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index c8e1682..832a2e8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-core @@ -13,6 +13,12 @@ # pulled by aruba %bcond_with bootstrap +# Disable Aruba support in RHEL due to excesive dependency chain. This also +# disables Cucumber integration test suite, which depends on Aruba as well. +%if ! 0%{?rhel} +%bcond_without aruba +%endif + %undefine __brp_mangle_shebangs Summary: RSpec runner and formatters @@ -36,17 +42,18 @@ BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) BuildRequires: rubygem(rake) BuildRequires: rubygem(rspec) -BuildRequires: rubygem(aruba) -# Newly -BuildRequires: rubygem(flexmock) -BuildRequires: rubygem(mocha) -BuildRequires: rubygem(rr) +BuildRequires: rubygem(test-unit) BuildRequires: rubygem(coderay) BuildRequires: rubygem(thread_order) BuildRequires: git -# New test + +%if %{with aruba} +BuildRequires: rubygem(aruba) +BuildRequires: rubygem(flexmock) +BuildRequires: rubygem(mocha) +BuildRequires: rubygem(rr) BuildRequires: rubygem(cucumber) -BuildRequires: rubygem(test-unit) +%endif %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: glibc-langpack-en @@ -97,6 +104,14 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %check %if %{without bootstrap} LANG=C.UTF-8 + +%if %{without aruba} +# Avoid dependency on Aruba. The files needs to be present, since they are +# listed by `git ls-files` from 'library wide checks' shared example. +truncate -s 0 spec/support/aruba_support.rb +find spec/integration -exec truncate -s 0 {} \; +%endif + # Adjust the backtrace filters to our directory layout. sed -i '/backtrace_exclusion_patterns/ s/rspec-core/rspec-core-%{version}/' \ spec/integration/{suite_hooks_errors,spec_file_load_errors}_spec.rb @@ -114,6 +129,8 @@ sed -i spec/rspec/core/example_spec.rb \ # FIXME seed 33413 sees test failure ruby -Ilib -S exe/rspec --seed 1 #33413 +%if %{with aruba} + # Mark failing test as broken sed -i features/command_line/init.feature \ -e 's|^\([ \t]*\)\(Scenario: Accept and use the recommended settings\)|\1@broken\n\1\2|' @@ -163,6 +180,8 @@ done %endif +%endif + %files %dir %{gem_instdir} @@ -181,6 +200,9 @@ done %{gem_docdir} %changelog +* Fri Mar 03 2023 Yaakov Selkowitz - 3.12.1-2 +- Disable unwanted dependencies in RHEL builds + * Fri Feb 10 2023 Mamoru TASAKA - 3.12.1-1 - 3.12.1 From 49cabb4d953ce69045b0ac4b9a0077aac8486c1a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 9 Mar 2023 16:20:27 +0900 Subject: [PATCH 104/126] refactor: do early exit and avoid looong if conditional --- rubygem-rspec-core.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 832a2e8..dcce0c3 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -102,7 +102,11 @@ cp -a .%{_prefix}/* %{buildroot}%{_prefix}/ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} %check -%if %{without bootstrap} +%if %{with bootstrap} +# Not do actual check, exiting. +exit 0 +%endif + LANG=C.UTF-8 %if %{without aruba} @@ -129,7 +133,10 @@ sed -i spec/rspec/core/example_spec.rb \ # FIXME seed 33413 sees test failure ruby -Ilib -S exe/rspec --seed 1 #33413 -%if %{with aruba} +%if %{without aruba} +# The following lines are for cucumber tests, so exiting. +exit 0 +%endif # Mark failing test as broken sed -i features/command_line/init.feature \ @@ -178,10 +185,6 @@ do done %endif -%endif - -%endif - %files %dir %{gem_instdir} From be8457ed9ab795369829575092802797d3812855 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:35:59 +0900 Subject: [PATCH 105/126] rename release macro to make rpmdev-bumprelease work --- rubygem-rspec-core.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index dcce0c3..82d66af 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 2 +%global baserelease 2 %global gem_name rspec-core @@ -24,7 +24,7 @@ Summary: RSpec runner and formatters Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} +Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} License: MIT URL: http://github.com/rspec/rspec-mocks From 9bdc5922e0e3522955535169fb32cc23c6b371f0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 Mar 2023 20:13:56 +0900 Subject: [PATCH 106/126] SPDX confirmed --- rubygem-rspec-core.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 82d66af..cfa8ce8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -26,6 +26,7 @@ Name: rubygem-%{gem_name} Version: %{majorver} Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} +# SPDX confirmed License: MIT URL: http://github.com/rspec/rspec-mocks Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem From eeb80ca9f028b1b9e294d2ea87fa4bd961b284ec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 14 Mar 2023 20:14:55 +0900 Subject: [PATCH 107/126] fix URL --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index cfa8ce8..ce026a0 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -28,7 +28,7 @@ Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} # SPDX confirmed License: MIT -URL: http://github.com/rspec/rspec-mocks +URL: http://github.com/rspec/rspec-core Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz From 8e8ad95bf1daf70fcf39619ef652831555bd97a7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 19 Apr 2023 17:14:51 +0900 Subject: [PATCH 108/126] 3.12.2 --- rubygem-rspec-core.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index ce026a0..199da28 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.12.1 +%global majorver 3.12.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 1 %global gem_name rspec-core @@ -88,7 +88,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 -%patch0 -p1 +%patch -P0 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -204,6 +204,9 @@ done %{gem_docdir} %changelog +* Wed Apr 19 2023 Mamoru TASAKA - 3.12.2-1 +- 3.12.2 + * Fri Mar 03 2023 Yaakov Selkowitz - 3.12.1-2 - Disable unwanted dependencies in RHEL builds diff --git a/sources b/sources index 0440561..06fb890 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.12.1.gem) = 986d19437c223511293094c0ad041d565cb78cdb5ecce0995bac963b9c27a4b346d914c7625ba4a6021cd8c64b8218aaf0788ce617b05adeb0f889565191e8c2 -SHA512 (rubygem-rspec-core-3.12.1-full.tar.gz) = 9cbce3e06d7645e16ea78944e4be32adae134f9037951232d72fa6d7e4140285737e49e0c494a076bf479cebccbfdf2fb1321156fe1821ee1404dd2d335bf2ba +SHA512 (rspec-core-3.12.2.gem) = b798d0624eb53ca866a76cac74885bfb37a2715d21346e097c0a9282a10581219cb7305212f89b14fc57f90fbc03fbd2655079c764902c556b7f174415c9e295 +SHA512 (rubygem-rspec-core-3.12.2-full.tar.gz) = 220becce9e96eaebb1280dfb52e8920e687069a09bcceeefe3e2cd8ef0cc0cb97ceec9e11fbd1e899e0b4e8f0c9317dc82a16a7b4ca7b2102c671d600bd1aad0 From 81ab95aa61daac05cf239d68f7b535b365651cfe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 18:20:06 +0000 Subject: [PATCH 109/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 199da28..29c5d94 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -204,6 +204,9 @@ done %{gem_docdir} %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Apr 19 2023 Mamoru TASAKA - 3.12.2-1 - 3.12.2 From 01442efdd9c4f688d746bac0cb303130421b7ed1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 22 Jul 2023 07:31:10 +0900 Subject: [PATCH 110/126] Fix one failing test related to thread local variable --- rubygem-rspec-core.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 29c5d94..12b0ad4 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 3 %global gem_name rspec-core @@ -131,6 +131,10 @@ sed -i spec/integration/spec_file_load_errors_spec.rb \ sed -i spec/rspec/core/example_spec.rb \ -e '\@defined.*RUBY_ENGINE.*truffleruby@s|^\(.*\)$|\1 \&\& false|' +# RSpec uses only one thread local variable: disable for now +sed -i spec/rspec/core_spec.rb \ + -e '\@only one thread local variable@s| it | xit |' + # FIXME seed 33413 sees test failure ruby -Ilib -S exe/rspec --seed 1 #33413 @@ -204,6 +208,9 @@ done %{gem_docdir} %changelog +* Sat Jul 22 2023 Mamoru TASAKA - 3.12.2-3 +- Fix one failing test related to thread local variable + * Fri Jul 21 2023 Fedora Release Engineering - 3.12.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 27cebec369e31dfd68690885069cc390e857faa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:26:24 +0000 Subject: [PATCH 111/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 12b0ad4..0619d3f 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 3 +%global baserelease 4 %global gem_name rspec-core @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 3.12.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Mamoru TASAKA - 3.12.2-3 - Fix one failing test related to thread local variable From c9fcb4c160ac23511c33e57ac478ac843a0a2aa5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2024 15:22:51 +0900 Subject: [PATCH 112/126] 3.13.0 --- rubygem-rspec-core.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 0619d3f..7bec586 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.12.2 +%global majorver 3.13.0 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 4 +%global baserelease 1 %global gem_name rspec-core @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%bcond_with bootstrap +%bcond_without bootstrap # Disable Aruba support in RHEL due to excesive dependency chain. This also # disables Cucumber integration test suite, which depends on Aruba as well. @@ -208,6 +208,9 @@ done %{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.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 06fb890..ce2b7b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.12.2.gem) = b798d0624eb53ca866a76cac74885bfb37a2715d21346e097c0a9282a10581219cb7305212f89b14fc57f90fbc03fbd2655079c764902c556b7f174415c9e295 -SHA512 (rubygem-rspec-core-3.12.2-full.tar.gz) = 220becce9e96eaebb1280dfb52e8920e687069a09bcceeefe3e2cd8ef0cc0cb97ceec9e11fbd1e899e0b4e8f0c9317dc82a16a7b4ca7b2102c671d600bd1aad0 +SHA512 (rspec-core-3.13.0.gem) = b24746c74ba6571c04ba1d95de3c557cc208870075cf7e9f603b18ac8b8dafbf5b2c8b2c58f564e91c58002947a64b5b30eed37069910e7d5bfa175faa2a58de +SHA512 (rubygem-rspec-core-3.13.0-full.tar.gz) = bfeb033a882769adbf65e2ce2cc2f6b3fcf2ad1095575fdb7d89b36b7d41af316119fe97020b10b3a8019c44db8464559c304a0e6fafaf8ba57df9e4f1cf9ff6 From 7cd8e8130799db80e871357fb959100b958517fd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2024 15:46:06 +0900 Subject: [PATCH 113/126] enable test again --- rubygem-rspec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 7bec586..455dce8 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -11,7 +11,7 @@ # runtime part of rspec-mocks does not depend on rspec-core # Disable test for now due to cucumber v.s. gherkin dependency issue # pulled by aruba -%bcond_without bootstrap +%bcond_with bootstrap # Disable Aruba support in RHEL due to excesive dependency chain. This also # disables Cucumber integration test suite, which depends on Aruba as well. From 229ca4c56a0a07017465e23479953a7a741b5a14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:54:36 +0000 Subject: [PATCH 114/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 455dce8..007cc27 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Feb 09 2024 Mamoru TASAKA - 3.13.0-1 - 3.13.0 From 54535562029999ef258e4fc46084364111db8085 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 8 Sep 2024 00:03:34 +0900 Subject: [PATCH 115/126] 3.13.1 3.13.1 --- rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 007cc27..afa9f25 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.0 +%global majorver 3.13.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 1 %global gem_name rspec-core @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Thu Sep 05 2024 Mamoru TASAKA - 3.13.1-1 +- 3.13.1 + * Fri Jul 19 2024 Fedora Release Engineering - 3.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index ce2b7b5..245d236 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.0.gem) = b24746c74ba6571c04ba1d95de3c557cc208870075cf7e9f603b18ac8b8dafbf5b2c8b2c58f564e91c58002947a64b5b30eed37069910e7d5bfa175faa2a58de -SHA512 (rubygem-rspec-core-3.13.0-full.tar.gz) = bfeb033a882769adbf65e2ce2cc2f6b3fcf2ad1095575fdb7d89b36b7d41af316119fe97020b10b3a8019c44db8464559c304a0e6fafaf8ba57df9e4f1cf9ff6 +SHA512 (rspec-core-3.13.1.gem) = c6b906fab43ece1145480331372094eb9c02059d8aa7903b22d9bca3e6f76f34e68cfcf3b40a64ff5b00b22e564d135f03c93934bc05cba9ec5d1b1cda0e2769 +SHA512 (rubygem-rspec-core-3.13.1-full.tar.gz) = defb6ff30ea787241c7353d4d5210eb77fcb526fbed3942c540506044ee4ffe3a43982f0fce4ac78d0c3959760ce179f7c7a7e55d3bb9e8c3b5988768d67c8ef From 0e1e9960be1e068c15300c8fc3586f49cad1f23b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 22 Oct 2024 14:17:02 +0900 Subject: [PATCH 116/126] 3.13.2 --- rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index afa9f25..044cf34 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.1 +%global majorver 3.13.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -208,6 +208,9 @@ done %{gem_docdir} %changelog +* Mon Oct 21 2024 Mamoru TASAKA - 3.13.2-1 +- 3.13.2 + * Thu Sep 05 2024 Mamoru TASAKA - 3.13.1-1 - 3.13.1 diff --git a/sources b/sources index 245d236..7e0e601 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.1.gem) = c6b906fab43ece1145480331372094eb9c02059d8aa7903b22d9bca3e6f76f34e68cfcf3b40a64ff5b00b22e564d135f03c93934bc05cba9ec5d1b1cda0e2769 -SHA512 (rubygem-rspec-core-3.13.1-full.tar.gz) = defb6ff30ea787241c7353d4d5210eb77fcb526fbed3942c540506044ee4ffe3a43982f0fce4ac78d0c3959760ce179f7c7a7e55d3bb9e8c3b5988768d67c8ef +SHA512 (rspec-core-3.13.2.gem) = 7ba117e1382f1ed787f9889efd0aac40a75de36a4b895600886fe7f3dc6a8efa029eea92208d8af0c3f4614e4214b99437bfc7d7ad9c93808e118405c6650513 +SHA512 (rubygem-rspec-core-3.13.2-full.tar.gz) = 61928d0a569510d6c49c8ce7025d37f6a60532f731458f159d340966582e7c0dc794c828dcbd33c8d4deefea3ed8fb104fc03060c9c4fbec47dfc972246e533a From ca81d02368e311d900ed13eece031aa11109e5d0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Nov 2024 22:21:07 +0900 Subject: [PATCH 117/126] add BR: rubygem(drb) for ruby34 --- rubygem-rspec-core.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 044cf34..8c33193 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -45,6 +45,7 @@ BuildRequires: rubygem(rake) BuildRequires: rubygem(rspec) BuildRequires: rubygem(test-unit) BuildRequires: rubygem(coderay) +BuildRequires: rubygem(drb) BuildRequires: rubygem(thread_order) BuildRequires: git @@ -208,6 +209,9 @@ done %{gem_docdir} %changelog +* Wed Nov 06 2024 Mamoru TASAKA - 3.13.2-2 +- add BR: rubygem(drb) for ruby34 + * Mon Oct 21 2024 Mamoru TASAKA - 3.13.2-1 - 3.13.2 From 91ba31bd1ca893d6901bb602ff2bd976e3c3c766 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Nov 2024 15:07:10 +0900 Subject: [PATCH 118/126] Fix for ruby34 string behavior to be chilled --- ...core-3.13.2-issue3123-ruby34-string-chilled.patch | 12 ++++++++++++ rubygem-rspec-core.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch diff --git a/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch b/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch new file mode 100644 index 0000000..2ab514d --- /dev/null +++ b/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch @@ -0,0 +1,12 @@ +diff -urp -x examples.txt '--exclude=*~' rspec-core-3.13.2.orig/lib/rspec/core/drb.rb rspec-core-3.13.2/lib/rspec/core/drb.rb +--- rspec-core-3.13.2.orig/lib/rspec/core/drb.rb 2024-10-21 14:23:30.000000000 +0900 ++++ rspec-core-3.13.2/lib/rspec/core/drb.rb 2024-11-15 14:48:52.388539773 +0900 +@@ -91,7 +91,7 @@ module RSpec + def add_filter(argv, name, hash) + hash.each_pair do |k, v| + next if CONDITIONAL_FILTERS.include?(k) +- tag = name == :inclusion ? k.to_s : "~#{k}".dup ++ tag = name == :inclusion ? k.to_s.dup : "~#{k}".dup + tag << ":#{v}" if v.is_a?(String) + argv << "--tag" << tag + end unless hash.empty? diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 8c33193..fd6b76f 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 3 %global gem_name rspec-core @@ -36,6 +36,9 @@ Source2: rspec-related-create-full-tarball.sh # Adjust backtrace filter for Fedora placement of StdLib. # https://github.com/rspec/rspec-core/pull/2881 Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch +# https://github.com/rspec/rspec-core/issues/3123 +# <- by https://github.com/ruby/ruby/pull/12065 +Patch1: rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -90,6 +93,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 +%patch -P1 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -209,6 +213,9 @@ done %{gem_docdir} %changelog +* Fri Nov 15 2024 Mamoru TASAKA - 3.13.2-3 +- Fix for ruby34 string behavior to be chilled + * Wed Nov 06 2024 Mamoru TASAKA - 3.13.2-2 - add BR: rubygem(drb) for ruby34 From cdd2413fa07e8a1333b33b7eac73f3bfdba67b3b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Nov 2024 16:59:26 +0900 Subject: [PATCH 119/126] Workaround syntax_suggest 2.0.2 change --- ...e-3.13.2-issue3125-ruby34-syntax_suggest_202.patch | 11 +++++++++++ rubygem-rspec-core.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch diff --git a/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch b/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch new file mode 100644 index 0000000..96eb999 --- /dev/null +++ b/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch @@ -0,0 +1,11 @@ +diff -urp -x examples.txt rspec-core-3.13.2.orig/spec/integration/spec_file_load_errors_spec.rb rspec-core-3.13.2/spec/integration/spec_file_load_errors_spec.rb +--- rspec-core-3.13.2.orig/spec/integration/spec_file_load_errors_spec.rb 2024-11-17 15:44:24.856119952 +0900 ++++ rspec-core-3.13.2/spec/integration/spec_file_load_errors_spec.rb 2024-11-17 16:39:55.929770026 +0900 +@@ -224,6 +224,7 @@ RSpec.describe 'Spec file load errors' d + + # A fix was backported to 3.2.3 + if RUBY_VERSION > '3.2.2' ++ formatted_output.gsub!(/\n+/m, "\n") + expect(formatted_output).to include unindent(<<-EOS) + SyntaxError: + --> ./tmp/aruba/broken_file.rb diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index fd6b76f..af100de 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 3 +%global baserelease 4 %global gem_name rspec-core @@ -39,6 +39,9 @@ Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch # https://github.com/rspec/rspec-core/issues/3123 # <- by https://github.com/ruby/ruby/pull/12065 Patch1: rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch +# https://github.com/rspec/rspec-core/issues/3125 +# <- by syntax_suggest 2.0.2 https://github.com/ruby/syntax_suggest/pull/232 +Patch2: rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -94,6 +97,7 @@ This package contains documentation for %{name}. %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 %patch -P1 -p1 +%patch -P2 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -213,6 +217,9 @@ done %{gem_docdir} %changelog +* Sun Nov 17 2024 Mamoru TASAKA - 3.13.2-4 +- Workaround syntax_suggest 2.0.2 change + * Fri Nov 15 2024 Mamoru TASAKA - 3.13.2-3 - Fix for ruby34 string behavior to be chilled From 29635ced96c6b8bf23e7b41913b4702b9b118578 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:57:21 +0000 Subject: [PATCH 120/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index af100de..e6d6a07 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 4 +%global baserelease 5 %global gem_name rspec-core @@ -217,6 +217,9 @@ done %{gem_docdir} %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.13.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Nov 17 2024 Mamoru TASAKA - 3.13.2-4 - Workaround syntax_suggest 2.0.2 change From 45cdfd6fec41c39e745c4882a5c1b17c0647f568 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Feb 2025 16:12:01 +0900 Subject: [PATCH 121/126] 3.13.3 --- ...e-3.13.2-issue3123-ruby34-string-chilled.patch | 12 ------------ ...13.2-issue3125-ruby34-syntax_suggest_202.patch | 11 ----------- rspec-related-create-full-tarball.sh | 7 +++---- rubygem-rspec-core.spec | 15 +++++---------- sources | 4 ++-- 5 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch delete mode 100644 rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch diff --git a/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch b/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch deleted file mode 100644 index 2ab514d..0000000 --- a/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp -x examples.txt '--exclude=*~' rspec-core-3.13.2.orig/lib/rspec/core/drb.rb rspec-core-3.13.2/lib/rspec/core/drb.rb ---- rspec-core-3.13.2.orig/lib/rspec/core/drb.rb 2024-10-21 14:23:30.000000000 +0900 -+++ rspec-core-3.13.2/lib/rspec/core/drb.rb 2024-11-15 14:48:52.388539773 +0900 -@@ -91,7 +91,7 @@ module RSpec - def add_filter(argv, name, hash) - hash.each_pair do |k, v| - next if CONDITIONAL_FILTERS.include?(k) -- tag = name == :inclusion ? k.to_s : "~#{k}".dup -+ tag = name == :inclusion ? k.to_s.dup : "~#{k}".dup - tag << ":#{v}" if v.is_a?(String) - argv << "--tag" << tag - end unless hash.empty? diff --git a/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch b/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch deleted file mode 100644 index 96eb999..0000000 --- a/rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urp -x examples.txt rspec-core-3.13.2.orig/spec/integration/spec_file_load_errors_spec.rb rspec-core-3.13.2/spec/integration/spec_file_load_errors_spec.rb ---- rspec-core-3.13.2.orig/spec/integration/spec_file_load_errors_spec.rb 2024-11-17 15:44:24.856119952 +0900 -+++ rspec-core-3.13.2/spec/integration/spec_file_load_errors_spec.rb 2024-11-17 16:39:55.929770026 +0900 -@@ -224,6 +224,7 @@ RSpec.describe 'Spec file load errors' d - - # A fix was backported to 3.2.3 - if RUBY_VERSION > '3.2.2' -+ formatted_output.gsub!(/\n+/m, "\n") - expect(formatted_output).to include unindent(<<-EOS) - SyntaxError: - --> ./tmp/aruba/broken_file.rb 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-core.spec b/rubygem-rspec-core.spec index e6d6a07..471b767 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.2 +%global majorver 3.13.3 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 5 +%global baserelease 1 %global gem_name rspec-core @@ -36,12 +36,6 @@ Source2: rspec-related-create-full-tarball.sh # Adjust backtrace filter for Fedora placement of StdLib. # https://github.com/rspec/rspec-core/pull/2881 Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch -# https://github.com/rspec/rspec-core/issues/3123 -# <- by https://github.com/ruby/ruby/pull/12065 -Patch1: rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch -# https://github.com/rspec/rspec-core/issues/3125 -# <- by syntax_suggest 2.0.2 https://github.com/ruby/syntax_suggest/pull/232 -Patch2: rspec-core-3.13.2-issue3125-ruby34-syntax_suggest_202.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -96,8 +90,6 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -217,6 +209,9 @@ done %{gem_docdir} %changelog +* Tue Feb 11 2025 Mamoru TASAKA - 3.13.3-1 +- 3.13.3 + * Sat Jan 18 2025 Fedora Release Engineering - 3.13.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 7e0e601..dca932c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.2.gem) = 7ba117e1382f1ed787f9889efd0aac40a75de36a4b895600886fe7f3dc6a8efa029eea92208d8af0c3f4614e4214b99437bfc7d7ad9c93808e118405c6650513 -SHA512 (rubygem-rspec-core-3.13.2-full.tar.gz) = 61928d0a569510d6c49c8ce7025d37f6a60532f731458f159d340966582e7c0dc794c828dcbd33c8d4deefea3ed8fb104fc03060c9c4fbec47dfc972246e533a +SHA512 (rubygem-rspec-core-3.13.3-full.tar.gz) = 8d031e11c2467f3626341ec874fde007db97823b83c30f04a2cea6c1b0692c719647ca7f36d9190ca2410010af2827cb742e3af096e678d88232c7e5064e3281 +SHA512 (rspec-core-3.13.3.gem) = 33c06cfab982f6f1b2f75d4f0f8aaa81aa87ce62c31c8ff8fe880d3e41d7a3a5d10b9efc6f49135f2624194cbb9775e30dbb52819ee94c767a3cb85492686635 From 87bc1190a316e8ecedf4df554fc232d1510ca17e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 May 2025 17:33:15 +0900 Subject: [PATCH 122/126] 3.13.4 --- rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 471b767..bfa7a8d 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.3 +%global majorver 3.13.4 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -28,7 +28,7 @@ Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} # SPDX confirmed License: MIT -URL: http://github.com/rspec/rspec-core +URL: https://rspec.info Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz @@ -209,6 +209,9 @@ done %{gem_docdir} %changelog +* Thu May 29 2025 Mamoru TASAKA - 3.13.4-1 +- 3.13.4 + * Tue Feb 11 2025 Mamoru TASAKA - 3.13.3-1 - 3.13.3 diff --git a/sources b/sources index dca932c..c7cf56a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-rspec-core-3.13.3-full.tar.gz) = 8d031e11c2467f3626341ec874fde007db97823b83c30f04a2cea6c1b0692c719647ca7f36d9190ca2410010af2827cb742e3af096e678d88232c7e5064e3281 -SHA512 (rspec-core-3.13.3.gem) = 33c06cfab982f6f1b2f75d4f0f8aaa81aa87ce62c31c8ff8fe880d3e41d7a3a5d10b9efc6f49135f2624194cbb9775e30dbb52819ee94c767a3cb85492686635 +SHA512 (rspec-core-3.13.4.gem) = 5727510a039a5c59ec86de57ebd13000a3f24f0d3db05fa4a2930184c8a9f011fe829b86f4c9a41a9d978ca58fead36648d70367f6fedd2626b60a1978ef7207 +SHA512 (rubygem-rspec-core-3.13.4-full.tar.gz) = 8873cfd241b7e08945f7f1fdec0dcd28a93f86abfcee44d31e3e6250ba1c5a1d8773406f77ecbc34e9009003fd9121d49d500f982c5cb54f14f5432dbd6b4172 From 3f7c63406ef50c5fdaf4a2d402022536d94c944c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 27 Jun 2025 22:39:02 +0900 Subject: [PATCH 123/126] 3.13.5 --- rubygem-rspec-core.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index bfa7a8d..775cb51 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.4 +%global majorver 3.13.5 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -209,6 +209,9 @@ done %{gem_docdir} %changelog +* Fri Jun 27 2025 Mamoru TASAKA - 3.13.5-1 +- 3.13.5 + * Thu May 29 2025 Mamoru TASAKA - 3.13.4-1 - 3.13.4 diff --git a/sources b/sources index c7cf56a..2bbf4c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.4.gem) = 5727510a039a5c59ec86de57ebd13000a3f24f0d3db05fa4a2930184c8a9f011fe829b86f4c9a41a9d978ca58fead36648d70367f6fedd2626b60a1978ef7207 -SHA512 (rubygem-rspec-core-3.13.4-full.tar.gz) = 8873cfd241b7e08945f7f1fdec0dcd28a93f86abfcee44d31e3e6250ba1c5a1d8773406f77ecbc34e9009003fd9121d49d500f982c5cb54f14f5432dbd6b4172 +SHA512 (rspec-core-3.13.5.gem) = ee5f98d1b82ae6084a644bad4ed4c38b76fb0571fc6ea8d49d4459017fdf4615139f8b1f7d33951efde173d7e447da52aef36b13216bc4fb8cc73d1646461b70 +SHA512 (rubygem-rspec-core-3.13.5-full.tar.gz) = d2ca4987aa957b192bc41bccc1cbcda8da86681b342e369c434d4a59ff64559101a345e072659995bc16a2ac4a135e9611feb1fb193f28cce53c0c80e26d5798 From e8c2a97d1a6df4ee1c8c233c9fd2975c949012fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:45:26 +0000 Subject: [PATCH 124/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-rspec-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 775cb51..ec835b4 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -209,6 +209,9 @@ done %{gem_docdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.13.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jun 27 2025 Mamoru TASAKA - 3.13.5-1 - 3.13.5 From 7effbf81cb92d50fc56a4061a342eb70a98d5bac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Oct 2025 15:07:20 +0900 Subject: [PATCH 125/126] 3.13.6 --- rubygem-rspec-core.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index ec835b4..1df05b5 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.5 +%global majorver 3.13.6 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 1 %global gem_name rspec-core @@ -209,6 +209,9 @@ done %{gem_docdir} %changelog +* Mon Oct 20 2025 Mamoru TASAKA - 3.13.6-1 +- 3.13.6 + * Fri Jul 25 2025 Fedora Release Engineering - 3.13.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 2bbf4c4..4078df9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-core-3.13.5.gem) = ee5f98d1b82ae6084a644bad4ed4c38b76fb0571fc6ea8d49d4459017fdf4615139f8b1f7d33951efde173d7e447da52aef36b13216bc4fb8cc73d1646461b70 -SHA512 (rubygem-rspec-core-3.13.5-full.tar.gz) = d2ca4987aa957b192bc41bccc1cbcda8da86681b342e369c434d4a59ff64559101a345e072659995bc16a2ac4a135e9611feb1fb193f28cce53c0c80e26d5798 +SHA512 (rspec-core-3.13.6.gem) = 8456a4505bd990a968630da475fd5222a15e0641db26d0efbf63e5d1d8edea702c7982297c4fd7e647167b7204127e4dd6d49480a9556faa65f06e0ce8ad3513 +SHA512 (rubygem-rspec-core-3.13.6-full.tar.gz) = 2cb5c5ffe9c76a58385ccac68fbbc696e6c542cf68007ab81b29e5ad6ecc97ec05cd34eb1006b2be1d70c826ab520b32e37182bbd14f662260996a1e5aa1bf06 From 474d1f7c635c218569b4b84c143fe2c41b267e47 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Dec 2025 16:42:35 +0900 Subject: [PATCH 126/126] Backport upstream patch to support ruby4_0 source_location behavior change --- ...c-core-pr282-ruby4_0-source_location.patch | 51 +++++++++++++++++++ rubygem-rspec-core.spec | 9 +++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 rspec-core-pr282-ruby4_0-source_location.patch diff --git a/rspec-core-pr282-ruby4_0-source_location.patch b/rspec-core-pr282-ruby4_0-source_location.patch new file mode 100644 index 0000000..1fa6999 --- /dev/null +++ b/rspec-core-pr282-ruby4_0-source_location.patch @@ -0,0 +1,51 @@ +From 1c20fa80772ca7a1ed0512056ce7cd6a94f8e68d Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Fri, 28 Nov 2025 10:59:10 +0000 +Subject: [PATCH] Cope with the changes to block source_location in Ruby 4 + +--- + rspec-core/lib/rspec/core/hooks.rb | 2 +- + rspec-core/lib/rspec/core/metadata.rb | 2 +- + rspec-core/lib/rspec/core/shared_example_group.rb | 2 +- + .../lib/rspec/expectations/block_snippet_extractor.rb | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/rspec-core/lib/rspec/core/hooks.rb b/rspec-core/lib/rspec/core/hooks.rb +index f97962ce9..77eecc776 100644 +--- a/rspec-core/lib/rspec/core/hooks.rb ++++ b/rspec-core/lib/rspec/core/hooks.rb +@@ -395,7 +395,7 @@ def execute_with(example, procsy) + + if Proc.method_defined?(:source_location) + def hook_description +- "around hook at #{Metadata.relative_path(block.source_location.join(':'))}" ++ "around hook at #{Metadata.relative_path(block.source_location.take(2).join(':'))}" + end + else # for 1.8.7 + # :nocov: +diff --git a/rspec-core/lib/rspec/core/metadata.rb b/rspec-core/lib/rspec/core/metadata.rb +index e887cb1c5..ed47bc07b 100644 +--- a/rspec-core/lib/rspec/core/metadata.rb ++++ b/rspec-core/lib/rspec/core/metadata.rb +@@ -146,7 +146,7 @@ def populate_location_attributes + file_path, line_number = if backtrace + file_path_and_line_number_from(backtrace) + elsif block.respond_to?(:source_location) +- block.source_location ++ block.source_location.take(2) + else + file_path_and_line_number_from(caller) + end +diff --git a/rspec-core/lib/rspec/core/shared_example_group.rb b/rspec-core/lib/rspec/core/shared_example_group.rb +index b4a5dc317..1f2b9d623 100644 +--- a/rspec-core/lib/rspec/core/shared_example_group.rb ++++ b/rspec-core/lib/rspec/core/shared_example_group.rb +@@ -243,7 +243,7 @@ def warn_if_key_taken(context, key, new_block) + + if RUBY_VERSION.to_f >= 1.9 + def formatted_location(block) +- block.source_location.join(":") ++ block.source_location.take(2).join(":") + end + else # 1.8.7 + # :nocov: diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 1df05b5..d3183f3 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-core @@ -36,6 +36,9 @@ Source2: rspec-related-create-full-tarball.sh # Adjust backtrace filter for Fedora placement of StdLib. # https://github.com/rspec/rspec-core/pull/2881 Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch +# https://github.com/rspec/rspec/pull/282/commits/1c20fa80772ca7a1ed0512056ce7cd6a94f8e68d +# Support ruby4_0 source_location behavior change +Patch1: rspec-core-pr282-ruby4_0-source_location.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -90,6 +93,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 +%patch -P1 -p2 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -209,6 +213,9 @@ done %{gem_docdir} %changelog +* Tue Dec 02 2025 Mamoru TASAKA - 3.13.6-2 +- Backport upstream patch to support ruby4_0 source_location behavior change + * Mon Oct 20 2025 Mamoru TASAKA - 3.13.6-1 - 3.13.6