From 2588a28886aac68f873b6d9f22e8dbae9aaeb6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 28 Nov 2024 17:23:08 +0100 Subject: [PATCH 1/7] Drop `BR: rubygem(pry)` The dependency is removed by Patch2 and every other traces are further removed upstream in next version. https://github.com/cucumber/aruba/pull/939 --- rubygem-aruba.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 6342c05..063a184 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -30,7 +30,6 @@ BuildRequires: rubygem(contracts) BuildRequires: rubygem(cucumber) BuildRequires: rubygem(irb) BuildRequires: rubygem(minitest) -BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(thor) BuildRequires: less From 9d5514744d532cc8d2564a09dccc93375f93da1a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Nov 2024 16:25:07 +0900 Subject: [PATCH 2/7] bump release and build --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 063a184..20e9684 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.2.0 -Release: 9%{?dist} +Release: 10%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -176,6 +176,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* 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 From a4d13598b67eb9cd08e207a07a061e9e4abbbaea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 22:58:47 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index a0da79c..c1edc57 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -160,6 +160,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* 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 From c9f30db5b6d83e21d05653ced974facdccb0d349 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Jun 2025 21:58:19 +0900 Subject: [PATCH 4/7] 2.3.1 --- rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch | 42 +++++++++++++++++++ rubygem-aruba.spec | 11 ++++- sources | 4 +- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch 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 new file mode 100644 index 0000000..93994cf --- /dev/null +++ b/rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch @@ -0,0 +1,42 @@ +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 c1edc57..69517fd 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.3.0 -Release: 2%{?dist} +Version: 2.3.1 +Release: 1%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -16,6 +16,9 @@ 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) @@ -59,6 +62,7 @@ done ln -sf ../lib popd %patch -P1 -p1 +%patch -P2 -p1 -R mv ../%{gem_name}-%{version}.gemspec . @@ -160,6 +164,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* 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 diff --git a/sources b/sources index c00ed5f..ea90ac5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.3.0.gem) = aa011aef7ffa996585612e1600085bef93920c2b4f718602cb4f4f9532941a1e0b989f6756c8e25af79d0e55554c59ccb9544fcd03ade9e9d44a6744d1b7790c -SHA512 (rubygem-aruba-2.3.0-testsuite.tar.gz) = 0bcbe1315bed0a6e8143d2f7f4f890180af2a170da9d131039faffaf6537d2fc8f3eae363ee19899b1666091a9727b6553082dc6df328014c56611d2055a7fb1 +SHA512 (aruba-2.3.1.gem) = 79b69bdf2076aee13a4f4d5d51154db2d8edcf3ea45407eecde9fc5608ae1928b9c72adb50d22b44043865f73438d18500aa12c6424627a9d52bbbc396392b7f +SHA512 (rubygem-aruba-2.3.1-testsuite.tar.gz) = 743aed57645719c2d462e314850cf9ae1c8bc62aae643095c3d1ad34b7e269cef8c8a396048b2f65bb2c3fbe6f61e7f7aa60a2438d374b43ef052d65af953099 From 72a6bf7bf1e8912ac9e8f8d24bd8660cafd38b9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:16:30 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-aruba.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 69517fd..216fcae 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -4,7 +4,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -164,6 +164,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* 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 From 0f8a25e69c1134a591b6e020c6fbcc02534688bd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 14 Sep 2025 16:22:15 +0900 Subject: [PATCH 6/7] 2.3.2 --- rubygem-aruba.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 216fcae..d9fbe5f 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -3,8 +3,8 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.3.2 +Release: 1%{?dist} # SPDX confirmed # templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above @@ -164,6 +164,9 @@ popd # from .%%{gem_instdir} %doc %{gem_instdir}/CHANGELOG.md %changelog +* 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 diff --git a/sources b/sources index ea90ac5..0237194 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.3.1.gem) = 79b69bdf2076aee13a4f4d5d51154db2d8edcf3ea45407eecde9fc5608ae1928b9c72adb50d22b44043865f73438d18500aa12c6424627a9d52bbbc396392b7f -SHA512 (rubygem-aruba-2.3.1-testsuite.tar.gz) = 743aed57645719c2d462e314850cf9ae1c8bc62aae643095c3d1ad34b7e269cef8c8a396048b2f65bb2c3fbe6f61e7f7aa60a2438d374b43ef052d65af953099 +SHA512 (aruba-2.3.2.gem) = daab8f3271722335596e707e104bad3865cff06ed67aa7d0ca63aaa13ec9266bad9c353782e60b52eee91a2c149f997e60db3a4de02a914d2a086d8546c8202b +SHA512 (rubygem-aruba-2.3.2-testsuite.tar.gz) = 2bf54b095a72a564a4399e95ca826d6031a189fb2b7f97cefd3e2d6e2cea050656bb3a6dcff04014bfb447f08b5632605c30aff0924a2f38f4339db1cd6f65c8 From a15dbce6d22914c0ff2451bef573411e37a8bb71 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 Dec 2025 23:48:57 +0900 Subject: [PATCH 7/7] 2.3.3 --- rubygem-aruba.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index d9fbe5f..2f9f1eb 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.2 +Version: 2.3.3 Release: 1%{?dist} # SPDX confirmed @@ -164,6 +164,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 diff --git a/sources b/sources index 0237194..01de0ee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aruba-2.3.2.gem) = daab8f3271722335596e707e104bad3865cff06ed67aa7d0ca63aaa13ec9266bad9c353782e60b52eee91a2c149f997e60db3a4de02a914d2a086d8546c8202b -SHA512 (rubygem-aruba-2.3.2-testsuite.tar.gz) = 2bf54b095a72a564a4399e95ca826d6031a189fb2b7f97cefd3e2d6e2cea050656bb3a6dcff04014bfb447f08b5632605c30aff0924a2f38f4339db1cd6f65c8 +SHA512 (aruba-2.3.3.gem) = 4892651a703d0b2badf15a7f45e461ab1478e53d290fc39e7b0a3fa2a4c4830754bdcabddb38ba3e161bd34071da85aad4f56ccaea5ff8b37a5d74ae1e7ca8c2 +SHA512 (rubygem-aruba-2.3.3-testsuite.tar.gz) = a2aa74d9c920dbc3b9709358f5e219886e54f92b85b34de15bd9614308dccd48a3f97bed2f286e8e4dc520259e63063d167a74d72ed70a0635cb8c7348ccb175