diff --git a/.gitignore b/.gitignore index 5a9c765..5037bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /rubygem-rspec-support-3.7.1-full.tar.gz /rspec-support-3.8.0.gem /rubygem-rspec-support-3.8.0-full.tar.gz +/rspec-support-3.8.2.gem +/rubygem-rspec-support-3.8.2-full.tar.gz diff --git a/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch b/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch deleted file mode 100644 index 4e3bf3c..0000000 --- a/0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a0e30cc7c8021067b78510b7cd29a7442adc34cb Mon Sep 17 00:00:00 2001 -From: Jon Rowe -Date: Wed, 26 Dec 2018 22:31:28 +0000 -Subject: [PATCH 09/13] Update nodes_by_line_number spec for change in Ruby - behaviour - ---- - spec/rspec/support/source_spec.rb | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/spec/rspec/support/source_spec.rb b/spec/rspec/support/source_spec.rb -index 0e3d569..56532ce 100644 ---- a/spec/rspec/support/source_spec.rb -+++ b/spec/rspec/support/source_spec.rb -@@ -79,10 +79,19 @@ module RSpec::Support - describe '#nodes_by_line_number' do - it 'returns a hash containing nodes for each line number' do - expect(source.nodes_by_line_number).to match( -- 1 => [ -- an_object_having_attributes(:type => :@int), -- an_object_having_attributes(:type => :@ident) -- ], -+ 1 => -+ if RUBY_VERSION >= '2.6.0' -+ [ -+ an_object_having_attributes(:type => :@int), -+ an_object_having_attributes(:type => :@period), -+ an_object_having_attributes(:type => :@ident) -+ ] -+ else -+ [ -+ an_object_having_attributes(:type => :@int), -+ an_object_having_attributes(:type => :@ident) -+ ] -+ end, - 2 => [ - an_object_having_attributes(:type => :@ident), - an_object_having_attributes(:type => :@ident) --- -2.20.1 - diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec index 838a313..f66b73b 100644 --- a/rubygem-rspec-support.spec +++ b/rubygem-rspec-support.spec @@ -1,9 +1,9 @@ %global gem_name rspec-support -%global mainver 3.8.0 +%global mainver 3.8.2 %undefine prever -%global mainrel 2 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global need_bootstrap_set 0 @@ -21,8 +21,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh -# Patches from upstream: -Patch9: 0009-Update-nodes_by_line_number-spec-for-change-in-Ruby-.patch # tweak regex for search path Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch @@ -58,7 +56,6 @@ Documentation for %{name} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec %patch100 -p1 -%patch9 -p1 %build gem build %{gem_name}.gemspec @@ -105,6 +102,9 @@ ruby -rrubygems -Ilib/ -S rspec spec/ || \ %doc %{gem_docdir} %changelog +* Fri Jun 21 2019 Mamoru TASAKA - 3.8.2-1 +- 3.8.2 + * Tue Feb 5 2019 Mamoru TASAKA - 3.8.0-2 - Backport upstream patch for ruby 2.6 changes diff --git a/sources b/sources index f9713cb..698434a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-support-3.8.0.gem) = b508ade0607a7628eb281fd4347d70eb43759d4a92e694588d8e0dc276f64caf522f4bc6d18c8e3e5cfd8317f9f96473f7322452590f12877c1a05c5f736b4c5 -SHA512 (rubygem-rspec-support-3.8.0-full.tar.gz) = 2ad9fe3b06aa2620c3ca506fbdd6ceb89b023caca06a9d02507083afc2780156d0ffe9f7e1f8e99744bb11fe6fd36a981f65c73863c80a5d37c663b164f6c1e1 +SHA512 (rspec-support-3.8.2.gem) = 7239db4eb2da594a410078d397bfedd524270f31f825bfcd12540278ad724a0383af77afbae2a8fd716c8309408e64c2922a39b3ce09032d66d5ab161f4a05c8 +SHA512 (rubygem-rspec-support-3.8.2-full.tar.gz) = 4a8a900d631257a050ce542a9d231e9b66344137a37f47ab1ad95979a39758405b2ce8b264393c9624860a86499f733d408e9a62e8e167dcab1dabc134687783