diff --git a/concurrent-ruby-1.0.5-fix-inspect-output.patch b/concurrent-ruby-1.0.5-fix-inspect-output.patch deleted file mode 100644 index b8e1b84..0000000 --- a/concurrent-ruby-1.0.5-fix-inspect-output.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/lib/concurrent/map.rb b/lib/concurrent/map.rb -index f3aa55d5..34696efc 100644 ---- a/lib/concurrent/map.rb -+++ b/lib/concurrent/map.rb -@@ -210,12 +210,8 @@ module Concurrent - undef :freeze - - # @!visibility private -- DEFAULT_OBJ_ID_STR_WIDTH = 0.size == 4 ? 7 : 14 # we want to look "native", 7 for 32-bit, 14 for 64-bit -- # override default #inspect() method: firstly, we don't want to be spilling our guts (i-vars), secondly, MRI backend's -- # #inspect() call on its @backend i-var will bump @backend's iter level while possibly yielding GVL - def inspect -- id_str = (object_id << 1).to_s(16).rjust(DEFAULT_OBJ_ID_STR_WIDTH, '0') -- "#<#{self.class.name}:0x#{id_str} entries=#{size} default_proc=#{@default_proc.inspect}>" -+ format '%s entries=%d default_proc=%s>', to_s[0..-2], size.to_s, @default_proc.inspect - end - - private diff --git a/concurrent-ruby-1.0.5.gem b/concurrent-ruby-1.0.5.gem deleted file mode 100644 index 4119d3a..0000000 Binary files a/concurrent-ruby-1.0.5.gem and /dev/null differ diff --git a/concurrent-ruby-1.1.9.gem b/concurrent-ruby-1.1.9.gem new file mode 100644 index 0000000..9ed64f2 Binary files /dev/null and b/concurrent-ruby-1.1.9.gem differ diff --git a/rubygem-concurrent-ruby.spec b/rubygem-concurrent-ruby.spec index 81e80bd..12b5dc5 100644 --- a/rubygem-concurrent-ruby.spec +++ b/rubygem-concurrent-ruby.spec @@ -1,15 +1,12 @@ %global gem_name concurrent-ruby Name: rubygem-%{gem_name} -Version: 1.0.5 -Release: 2 +Version: 1.1.9 +Release: 1 Summary: Modern concurrency tools for Ruby License: MIT URL: http://www.concurrent-ruby.com Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.5.tar.gz -# Avoid sporadic test failures due to wrong object_id formatting. -# https://github.com/ruby-concurrency/concurrent-ruby/pull/651 -Patch1: concurrent-ruby-1.0.5-fix-inspect-output.patch +Source1: https://github.com/ruby-concurrency/concurrent-ruby/archive/v%{version}.tar.gz BuildRequires: ruby(release) rubygems-devel ruby >= 1.9.3 rubygem(rspec) rubygem(timecop) BuildArch: noarch %description @@ -26,13 +23,10 @@ BuildArch: noarch Documentation for %{name}. %prep -gem unpack %{SOURCE0} -%setup -q -D -T -n %{gem_name}-%{version} -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch1 -p1 +%setup -q -n %{gem_name}-%{version} %build -gem build %{gem_name}.gemspec +gem build ../%{gem_name}-%{version}.gemspec %gem_install %install @@ -46,14 +40,17 @@ tar xzf %{SOURCE1} ln -s %{gem_name}-%{version}/spec spec sed -i '/require.*concurrent-edge/ s/^/#/' spec/spec_helper.rb sed -i '/allow_c_extensions?/,/^ end/ s/^/#/' spec/concurrent/atomic/atomic_reference_spec.rb -rspec -rspec_helper \ - --exclude-pattern 'spec/concurrent/{actor_spec.rb,channel_spec.rb,lazy_register_spec.rb,channel/**/*,atomic/atomic_markable_reference_spec.rb,edge/**/*}' \ +RUBYOPT=-Ilib/concurrent-ruby rspec -rspec_helper \ + -fd \ + --exclude-pattern 'spec/concurrent/{actor_spec.rb,channel_spec.rb,lazy_register_spec.rb,channel/**/*,edge/**/*,promises_spec.rb,throttle_spec.rb,cancellation_spec.rb,scheduled_task_spec.rb,timer_task_spec.rb,executor/wrapping_executor_spec.rb}' \ spec + popd %files %dir %{gem_instdir} %license %{gem_instdir}/LICENSE.txt +%exclude %{gem_instdir}/ext %{gem_libdir} %exclude %{gem_cache} %{gem_spec} @@ -61,9 +58,14 @@ popd %files doc %doc %{gem_docdir} %doc %{gem_instdir}/CHANGELOG.md +%{gem_instdir}/Gemfile %doc %{gem_instdir}/README.md +%{gem_instdir}/Rakefile %changelog +* Tue Jul 19 2022 liyanan - 1.1.9-1 +- update to 1.1.9 + * Tue Sep 8 2020 yanan li - 1.0.5-2 - fix build fail diff --git a/v1.0.5.tar.gz b/v1.0.5.tar.gz deleted file mode 100644 index 830a8ea..0000000 Binary files a/v1.0.5.tar.gz and /dev/null differ diff --git a/v1.1.9.tar.gz b/v1.1.9.tar.gz new file mode 100644 index 0000000..10d1a6d Binary files /dev/null and b/v1.1.9.tar.gz differ