From 3a68cdc90eeae318036febf40f8e3f535aa96d94 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 17 Feb 2021 08:05:21 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/rubygem-rspec-core.git#190fb4d37ddf57aaf195ae1094dc338748fd2795
---
 rubygem-rspec-core.spec | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec
index 67e8909..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	1
+%global	fedorarel	3
 
 %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,18 @@ 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
+# disabling tests failing with rr 1.2.1
+%if 0%{?fedora} >= 34
+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
 env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \
 	env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ \
@@ -152,6 +165,16 @@ env RUBYOPT="-I$(pwd)/lib -rrubygems" ruby -S cucumber -v features/ || \
 
 mv lib/rspec/core/configuration_options.rb{.warn,}
 
+%if 0%{?fedora} >= 34
+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
 
 %files
@@ -172,6 +195,12 @@ mv lib/rspec/core/configuration_options.rb{.warn,}
 %{gem_docdir}
 
 %changelog
+* Wed Feb 17 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-3
+- rr 1.2.1: Disable failing cucumber suite for now
+
+* Tue Jan 26 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-2
+- Ruby 3.0: Disable failing cucumber suite for now
+
 * Tue Dec 29 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-1
 - 3.10.1