4 changed files with 84 additions and 70 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/rspec-mocks-3.10.2.gem
-SOURCES/rubygem-rspec-mocks-3.10.2-full.tar.gz
+SOURCES/rspec-mocks-3.7.0.gem
+SOURCES/rubygem-rspec-mocks-3.7.0-full.tar.gz
--- a/.rubygem-rspec-mocks.metadata
+++ b/.rubygem-rspec-mocks.metadata
@ -1,2 +1,2 @@
-6820ddf5448ca6116567759fabb85d0b634e161b SOURCES/rspec-mocks-3.10.2.gem
-faabfc4bcef0591f2e2ed8c47b2d08e0ca0a2794 SOURCES/rubygem-rspec-mocks-3.10.2-full.tar.gz
+ba57acddaf6cea7c70250fef45a8727ecec1961e SOURCES/rspec-mocks-3.7.0.gem
+85feb66ca146e970358aa1cf9a521ab724d70d81 SOURCES/rubygem-rspec-mocks-3.7.0-full.tar.gz
--- a/SOURCES/rspec-mocks-3.7.0-test-ruby-25.patch
+++ b/SOURCES/rspec-mocks-3.7.0-test-ruby-25.patch
@ -0,0 +1,66 @@
+From 871eb31e3bfe50705ca57e754771aa1e0164f12d Mon Sep 17 00:00:00 2001
+From: Myron Marston <myron.marston@gmail.com>
+Date: Sat, 30 Dec 2017 17:45:43 -0800
+Subject: [PATCH 1/2] Skip spec that does not apply to Ruby 2.5.
+
+Ruby 2.5 has removed the ability to access top-level constants
+via a confusing nested form (e.g. `MyClass::Hash`), so we no
+longer need this spec there.
+
+For #1192.
+---
+ spec/rspec/mocks/mutate_const_spec.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/rspec/mocks/mutate_const_spec.rb b/spec/rspec/mocks/mutate_const_spec.rb
+index fe8d4128..9d80dd73 100644
+--- a/spec/rspec/mocks/mutate_const_spec.rb
+++ b/spec/rspec/mocks/mutate_const_spec.rb
+@@ -170,7 +170,7 @@ def change_const_value_to(value)
+             expect(::Hash).to equal(top_level_hash)
+           end
+ 
+-          it 'does not affect the ability to access the top-level constant from nested contexts', :silence_warnings do
+          it 'does not affect the ability to access the top-level constant from nested contexts', :silence_warnings, :if => RUBY_VERSION < '2.5' do
+             top_level_hash = ::Hash
+ 
+             hide_const("TestClass::Hash")
+
+From 783923d6879a2f9df9fee8ef24cecca6ac21136e Mon Sep 17 00:00:00 2001
+From: Myron Marston <myron.marston@gmail.com>
+Date: Sat, 30 Dec 2017 23:35:27 -0800
+Subject: [PATCH 2/2] Make spec less brittle.
+
+On Ruby 2.5, this spec failed, apparently due to the fact that
+Method equality has changed on 2.5 slightly. The method instances
+have always been different but 2.4 and before considered them
+equivalent. Instead, we can show that the two method objects
+_behave_ the same, which is what we really care about.
+
+Fixes #1192.
+---
+ spec/rspec/mocks/and_wrap_original_spec.rb | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/spec/rspec/mocks/and_wrap_original_spec.rb b/spec/rspec/mocks/and_wrap_original_spec.rb
+index df9cae46..2d4d0a8b 100644
+--- a/spec/rspec/mocks/and_wrap_original_spec.rb
+++ b/spec/rspec/mocks/and_wrap_original_spec.rb
+@@ -26,12 +26,13 @@ def results
+         }.to raise_error NameError
+       end
+ 
+-      it "passes in the original method" do
+-        value = nil
+      it "passes along the original method" do
+        passed_method = nil
+         original_method = instance.method(:results)
+-        allow_it.to receive(:results).and_wrap_original { |m| value = m }
+        allow_it.to receive(:results).and_wrap_original { |m| passed_method = m }
+         instance.results
+-        expect(value).to eq original_method
+
+        expect(passed_method.call).to eq(original_method.call)
+       end
+ 
+       it "passes along the message arguments" do
--- a/SPECS/rubygem-rspec-mocks.spec
+++ b/SPECS/rubygem-rspec-mocks.spec
@ -1,9 +1,9 @@
-%global	majorver	3.10.2
+%global	majorver	3.7.0
 #%%global	preminorver	.rc6
 %global	rpmminorver	.%(echo %preminorver | sed -e 's|^\\.\\.*||')
 %global	fullver	%{majorver}%{?preminorver}

-%global	fedorarel	1
+%global	fedorarel	4

 %global	gem_name	rspec-mocks

@ -14,19 +14,24 @@
 Summary:	RSpec's 'test double' framework (mocks and stubs)
 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
 URL:		http://github.com/rspec/rspec-mocks
 Source0:	https://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
+# https://github.com/rspec/rspec-mocks/pull/1196
+# https://github.com/rspec/rspec-mocks/commit/1d2f2404a17c3a76742379bb0c57d133df8e7371.patch
+Patch1:	rspec-mocks-3.7.0-test-ruby-25.patch

 #BuildRequires:	ruby(release)
 BuildRequires:	rubygems-devel
 %if 0%{?need_bootstrap_set} < 1
 BuildRequires:	rubygem(rspec)
+BuildRequires:	rubygem(rake)
 BuildRequires:	rubygem(thread_order)
 BuildRequires:	git
 %endif
@ -38,6 +43,7 @@ for method stubs, fakes, and message expectations.

 %package	doc
 Summary:	Documentation for %{name}
+Group:		Documentation
 Requires:	%{name} = %{version}-%{release}

 %description	doc
@ -48,6 +54,7 @@ This package contains documentation for %{name}.
 gem unpack %{SOURCE0}

 %setup -q -D -T -n  %{gem_name}-%{version} -b 1
+%patch1 -p1

 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec

@ -66,7 +73,7 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts}
 %if 0%{?need_bootstrap_set} < 1
 %check
 # library_wide_checks.rb needs UTF-8
-LANG=C.UTF-8
+LANG=en_US.utf8
 ruby -rrubygems -Ilib/ -S rspec spec/
 %endif

@ -86,67 +93,8 @@ ruby -rrubygems -Ilib/ -S rspec spec/
 %{gem_docdir}

 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.10.2-1.2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.10.2-1.1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Feb  1 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.2-1
- 3.10.2
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 29 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-1
- 3.10.1
-
-* Fri Dec 11 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.0-1
- Enable tests again
-
-* Fri Dec 11 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.0-0.1
- 3.10.0
- Once disable test for bootstrap
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.1-1.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.1-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan  2 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.1-1
- 3.9.1
-
-* Tue Dec 10 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.0-2
- Enable tests again
-
-* Tue Dec 10 2019 Mamoru 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.1-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.1-1
- 3.8.1
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 13 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.0-1
- Enable tests again
-
-* Wed Dec 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.0-0.1
- 3.8.0
- Once disable test for bootstrap
-
-* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.7.0-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 <releng@fedoraproject.org> - 3.7.0-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Thu Jul 12 2018 Jun Aruga <jaruga@redhat.com> - 3.7.0-4
+- Fix FTBFS by adding build dependency for RHEL.

 * Wed Feb 14 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.7.1-3
 - Backport patch to fix test failure with ruby 2.5