diff --git a/rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch b/rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch deleted file mode 100644 index 93994cf..0000000 --- a/rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bd2aea600f7e989e4da734c3e823c3ce12ce629b Mon Sep 17 00:00:00 2001 -From: Matijs van Zuijlen -Date: Sun, 6 Apr 2025 23:32:36 +0200 -Subject: [PATCH] Update expected diff output to match changes in diff-lcs - -Version 1.6.0 of diff-lcs included a bug fix that corrects the hunk -ranges it outputs. This change bumps the minimum version of diff-lcs to -1.6.0 so this change is sure to be included, and updates the -expectations in the cucumber scenarios that depend on exact diff-lcs -output. ---- - aruba.gemspec | 1 + - .../cucumber/steps/command/check_output_of_command.feature | 2 +- - .../cucumber/steps/command/check_stderr_of_command.feature | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature -index 3266514b..1f0d1997 100644 ---- a/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature -+++ b/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature -@@ -353,7 +353,7 @@ Feature: All output of commands which were executed - world" to output string is eq: "hello - worl" - Diff: -- @@ -1,3 +1,3 @@ -+ @@ -1,2 +1,2 @@ - hello - -worl - +world -diff --git a/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature -index cc0e7aad..d3b4c9a9 100644 ---- a/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature -+++ b/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature -@@ -82,7 +82,7 @@ Feature: STDERR of commands which were executed - expected "hello - world!" to output string is eq: "" - Diff: -- @@ -1,2 +1,4 @@ -+ @@ -0,0 +1,2 @@ - +hello - +world! - """ diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 2f9f1eb..ba9d2b3 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,7 +3,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.3.3 +Version: 2.3.0 Release: 1%{?dist} # SPDX confirmed @@ -16,9 +16,6 @@ Source1: %{name}-%{version}-testsuite.tar.gz Source2: %{gem_name}-create-test-suite-tarball.sh # Make bundler runtime dependency optional Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch -# https://github.com/cucumber/aruba/commit/bd2aea600f7e989e4da734c3e823c3ce12ce629b -# We still use diff-lcs 1.5, revert the above patch for now -Patch2: rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch BuildRequires: ruby(release) @@ -30,6 +27,7 @@ BuildRequires: rubygem(contracts) BuildRequires: rubygem(cucumber) BuildRequires: rubygem(irb) BuildRequires: rubygem(minitest) +BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(thor) BuildRequires: less @@ -62,7 +60,6 @@ done ln -sf ../lib popd %patch -P1 -p1 -%patch -P2 -p1 -R mv ../%{gem_name}-%{version}.gemspec . @@ -164,27 +161,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog -* Sat Dec 06 2025 Mamoru TASAKA - 2.3.3-1 -- 2.3.3 - -* Sun Sep 14 2025 Mamoru TASAKA - 2.3.2-1 -- 2.3.2 - -* Fri Jul 25 2025 Fedora Release Engineering - 2.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jun 15 2025 Mamoru TASAKA - 2.3.1-1 -- 2.3.1 - -* Sat Jan 18 2025 Fedora Release Engineering - 2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Fri Jan 03 2025 Mamoru TASAKA - 2.3.0-1 - 2.3.0 -* Thu Nov 28 2024 Vít Ondruch - 2.2.0-10 -- Drop BR: rubygem(pry) - * Fri Jul 19 2024 Fedora Release Engineering - 2.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 01de0ee..c00ed5f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.3.3.gem) = 4892651a703d0b2badf15a7f45e461ab1478e53d290fc39e7b0a3fa2a4c4830754bdcabddb38ba3e161bd34071da85aad4f56ccaea5ff8b37a5d74ae1e7ca8c2 -SHA512 (rubygem-aruba-2.3.3-testsuite.tar.gz) = a2aa74d9c920dbc3b9709358f5e219886e54f92b85b34de15bd9614308dccd48a3f97bed2f286e8e4dc520259e63063d167a74d72ed70a0635cb8c7348ccb175 +SHA512 (aruba-2.3.0.gem) = aa011aef7ffa996585612e1600085bef93920c2b4f718602cb4f4f9532941a1e0b989f6756c8e25af79d0e55554c59ccb9544fcd03ade9e9d44a6744d1b7790c +SHA512 (rubygem-aruba-2.3.0-testsuite.tar.gz) = 0bcbe1315bed0a6e8143d2f7f4f890180af2a170da9d131039faffaf6537d2fc8f3eae363ee19899b1666091a9727b6553082dc6df328014c56611d2055a7fb1