From b720dfdfb9ce4e6827ec034b7467ea1b673a45cc Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Tue, 10 Dec 2019 14:58:44 +0900
Subject: [PATCH] 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 <mtasaka@fedoraproject.org> - 3.9.0-0.1
+- 3.9.0
+- Once disable test for bootstrap
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 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