diff --git a/0001-fix-thread-dead-lock-error.patch b/0001-fix-thread-dead-lock-error.patch deleted file mode 100644 index 3c87953..0000000 --- a/0001-fix-thread-dead-lock-error.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 947d86e4fb8deeb1b7e4ca11b367de38e2f40b7a Mon Sep 17 00:00:00 2001 -From: wang--ge -Date: Thu, 5 Jan 2023 18:01:18 +0800 -Subject: [PATCH] fix thread dead lock error - ---- - lib/rspec/support/reentrant_mutex.rb | 15 ++++--- - spec/rspec/support/reentrant_mutex_spec.rb | 46 +++++++++++----------- - 2 files changed, 33 insertions(+), 28 deletions(-) - -diff --git a/lib/rspec/support/reentrant_mutex.rb b/lib/rspec/support/reentrant_mutex.rb -index 55fbf89..2dc7427 100644 ---- a/lib/rspec/support/reentrant_mutex.rb -+++ b/lib/rspec/support/reentrant_mutex.rb -@@ -31,16 +31,21 @@ module RSpec - # depends on `owned?` that was introduced in Ruby 2.0, so both should work for Ruby 2.x. - if RUBY_VERSION.to_f >= 3.0 - def enter -- @mutex.lock unless @mutex.owned? -+ @mutex.lock if @owner != Thread.current -+ @owner = Thread.current -+ #@mutex.lock unless @mutex.owned? - @count += 1 - end - - def exit -- unless @mutex.owned? -- raise ThreadError, "Attempt to unlock a mutex which is locked by another thread/fiber" -- end -+ #unless @mutex.owned? -+ # raise ThreadError, "Attempt to unlock a mutex which is locked by another thread/fiber" -+ #end - @count -= 1 -- @mutex.unlock if @count == 0 -+ return unless @count == 0 -+ @owner = nil -+ @mutex.unlock -+ #@mutex.unlock if @count == 0 - end - else - def enter -diff --git a/spec/rspec/support/reentrant_mutex_spec.rb b/spec/rspec/support/reentrant_mutex_spec.rb -index 9bef54e..7194d7b 100644 ---- a/spec/rspec/support/reentrant_mutex_spec.rb -+++ b/spec/rspec/support/reentrant_mutex_spec.rb -@@ -28,27 +28,27 @@ RSpec.describe RSpec::Support::ReentrantMutex do - order.join_all - end - -- if RUBY_VERSION >= '3.0' -- it 'waits when trying to lock from another Fiber' do -- mutex.synchronize do -- ready = false -- f = Fiber.new do -- expect { -- ready = true -- mutex.send(:enter) -- raise 'should reach here: mutex is already locked on different Fiber' -- }.to raise_error(Exception, 'waited correctly') -- end -- -- main_thread = Thread.current -- -- t = Thread.new do -- Thread.pass until ready && main_thread.stop? -- main_thread.raise Exception, 'waited correctly' -- end -- f.resume -- t.join -- end -- end -- end -+ #if RUBY_VERSION >= '3.0' -+ # it 'waits when trying to lock from another Fiber' do -+ # mutex.synchronize do -+ # ready = false -+ # f = Fiber.new do -+ # expect { -+ # ready = true -+ # mutex.send(:enter) -+ # raise 'should reach here: mutex is already locked on different Fiber' -+ # }.to raise_error(Exception, 'waited correctly') -+ # end -+ -+ # main_thread = Thread.current -+ -+ # t = Thread.new do -+ # Thread.pass until ready && main_thread.stop? -+ # main_thread.raise Exception, 'waited correctly' -+ # end -+ # f.resume -+ # t.join -+ # end -+ # end -+ #end - end --- -2.27.0 - diff --git a/rspec-support-3.12.0.gem b/rspec-support-3.12.0.gem deleted file mode 100644 index 1902af6..0000000 Binary files a/rspec-support-3.12.0.gem and /dev/null differ diff --git a/rspec-support-3.12.1.gem b/rspec-support-3.12.1.gem new file mode 100644 index 0000000..8686557 Binary files /dev/null and b/rspec-support-3.12.1.gem differ diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index ce5b541..d6e1bb6 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,5 +1,5 @@ %global gem_name rspec-support -%global mainver 3.12.0 +%global mainver 3.12.1 %undefine prever %global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') @@ -7,14 +7,13 @@ %undefine __brp_mangle_shebangs Name: rubygem-%{gem_name} Version: %{mainver} -Release: 2 +Release: 1 Summary: Common functionality to Rspec series License: MIT URL: https://github.com/rspec/rspec-support Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem Source1: https://github.com/rspec/%{gem_name}/archive/v%{mainver}.tar.gz # tweak regex for search path -Patch1: 0001-fix-thread-dead-lock-error.patch Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch BuildRequires: rubygems-devel rubygem-simplecov rubygem(did_you_mean) %if 0%{?need_bootstrap_set} < 1 @@ -36,7 +35,6 @@ Documentation for %{name} %prep %setup -q -T -n %{gem_name}-%{version} -b 1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch1 -p1 %patch100 -p1 @@ -80,6 +78,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Wed Nov 15 2023 wangkai <13474090681@163.com> - 3.12.1-1 +- Update to 3.12.1 + * Wed Jan 18 2023 Ge Wang - 3.12.0-2 - Restore need_bootstrap_set flag after upgrade diff --git a/v3.12.0.tar.gz b/v3.12.0.tar.gz deleted file mode 100644 index 8ff1de2..0000000 Binary files a/v3.12.0.tar.gz and /dev/null differ diff --git a/v3.12.1.tar.gz b/v3.12.1.tar.gz new file mode 100644 index 0000000..9f72bc8 Binary files /dev/null and b/v3.12.1.tar.gz differ