From db4650fe0edf7a2a76c1a69f528f3e152601cb73 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 10 Mar 2021 13:21:30 +0100 Subject: [PATCH] Update to cucumber-core 10.0.1 also enhance .spec and .gitignore files. Resolves: rhbz#1632225 --- .gitignore | 6 ++-- ...6.0.0-Remove-unintended-private-call.patch | 25 ---------------- rubygem-cucumber-core.spec | 29 +++++++------------ sources | 4 +-- 4 files changed, 14 insertions(+), 50 deletions(-) delete mode 100644 rubygem-cucumber-core-6.0.0-Remove-unintended-private-call.patch diff --git a/.gitignore b/.gitignore index fc20855..3f6b53f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/cucumber-core-1.4.0.gem -/cucumber-core-1.5.0.gem -/cucumber-core-3.2.0.gem -/rubygem-cucumber-core-3.2.0-spec.tar.gz +/cucumber-core-*.gem +/rubygem-cucumber-core-*-spec.txz diff --git a/rubygem-cucumber-core-6.0.0-Remove-unintended-private-call.patch b/rubygem-cucumber-core-6.0.0-Remove-unintended-private-call.patch deleted file mode 100644 index 23a5e87..0000000 --- a/rubygem-cucumber-core-6.0.0-Remove-unintended-private-call.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a88115f8668ff9c2ca91e11afc0529105c06446f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20Rodr=C3=ADguez?= -Date: Sun, 12 Jan 2020 13:41:59 +0100 -Subject: [PATCH] Remove unintended `private` call - -From reading https://bugs.ruby-lang.org/issues/13249, I don't think -`private` is having any effect here, since it's only supposed to affect -further methods defined inside the current class method (if at all), and -this method does not define any method inside itself. ---- - lib/cucumber/core/test/result.rb | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/cucumber/core/test/result.rb b/lib/cucumber/core/test/result.rb -index 136002a..21d06c8 100644 ---- a/lib/cucumber/core/test/result.rb -+++ b/lib/cucumber/core/test/result.rb -@@ -9,7 +9,6 @@ module Result - STRICT_AFFECTED_TYPES = [:flaky, :undefined, :pending].freeze - - def self.ok?(type, be_strict = StrictConfiguration.new) -- private - class_name = type.to_s.slice(0, 1).capitalize + type.to_s.slice(1..-1) - const_get(class_name).ok?(be_strict.strict?(type)) - end diff --git a/rubygem-cucumber-core.spec b/rubygem-cucumber-core.spec index b1aa8b4..db8369a 100644 --- a/rubygem-cucumber-core.spec +++ b/rubygem-cucumber-core.spec @@ -2,18 +2,15 @@ %global gem_name cucumber-core Name: rubygem-%{gem_name} -Version: 3.2.0 -Release: 11%{?dist} +Version: 10.0.1 +Release: 1%{?dist} Summary: Core library for the Cucumber BDD app License: MIT URL: https://cucumber.io Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# git clone https://github.com/cucumber/cucumber-ruby-core.git && cd cucumber-ruby-core -# git checkout v3.2.0 && tar czvf rubygem-cucumber-core-3.2.0-spec.tar.gz spec/ -Source1: %{name}-%{version}-spec.tar.gz -# Fix warnings affecting cucumber-wire test suite. -# https://github.com/cucumber/cucumber-ruby-core/pull/191 -Patch0: rubygem-cucumber-core-6.0.0-Remove-unintended-private-call.patch +# git clone --no-checkout https://github.com/cucumber/cucumber-ruby-core.git +# git -C cucumber-ruby-core archive -v -o rubygem-cucumber-core-10.0.1-spec.txz v10.0.1 spec/ +Source1: %{name}-%{version}-spec.txz BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby @@ -21,6 +18,7 @@ BuildRequires: rubygem(gherkin) BuildRequires: rubygem(rspec) BuildRequires: rubygem(kramdown-parser-gfm) BuildRequires: rubygem(cucumber-tag_expressions) +BuildRequires: rubygem(cucumber-messages) BuildRequires: rubygem(backports) # BuildRequires: rubygem(unindent) BuildArch: noarch @@ -40,16 +38,6 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -b 1 -%patch0 -p1 - -# We do not have gherkin 5 in Fedora yet. -%gemspec_remove_dep -s ../%{gem_name}-%{version}.gemspec -g gherkin '>= 5.0.0' -%gemspec_add_dep -s ../%{gem_name}-%{version}.gemspec -g gherkin '>= 4.1.0' - -%gemspec_remove_dep -s ../%{gem_name}-%{version}.gemspec -g cucumber-tag_expressions '~> 1.1.0' -%gemspec_add_dep -s ../%{gem_name}-%{version}.gemspec -g cucumber-tag_expressions '>= 1.1.0' - - %build gem build ../%{gem_name}-%{version}.gemspec @@ -60,7 +48,6 @@ mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ - %check pushd .%{gem_instdir} ln -s %{_builddir}/spec spec @@ -89,6 +76,10 @@ popd %doc %{gem_instdir}/CHANGELOG.md %changelog +* Mon Sep 06 2021 Pavel Valena - 10.0.1-1 +- Update to cucumber-core 10.0.1. + Resolves: rhbz#1632225 + * Fri Jul 23 2021 Fedora Release Engineering - 3.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index d497a38..e1e7439 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cucumber-core-3.2.0.gem) = 98420a6ecde649609c985efb7c4fd5d11646eec587bf98de789174e3918718c3725bfe2dfd16bd62fe515db0b70dec5629ec5efa6f7a9fbbebf657b85a8af6cc -SHA512 (rubygem-cucumber-core-3.2.0-spec.tar.gz) = 81df5aa8824e9f4b7fc958a7ff473c9b80a1bcbcc77868f0e2a937fced2e6386cfeef2eababa369f5b78cf89315e4fadc47f42b06176da2b7ac2932ca872e361 +SHA512 (cucumber-core-10.0.1.gem) = 228408c024b4a13b6144d4b03e35b804e5e53283073a34433eb0beae103aa5d5c278567076b91116e2bc1b1c5067bc2f627400fb97ee3593bada9788e6cad9f6 +SHA512 (rubygem-cucumber-core-10.0.1-spec.txz) = 599d1432924a0b6e07b209794f4d082c7bb86222318f567cd73e4e75a31572842801953c2a03cedace164b6e32fdaa15792d480181d94747a92782cb4a304609