From 90248d6341115b42a9fff78d5b9e36feb9f6bb647ba61e2f08e02ca0b271f952 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 9 Jun 2023 18:22:17 +0000 Subject: [PATCH] Accepting request 1091756 from home:smolsheep:upgrades - Update to version 0.41.1: * Fixed a bug where preview window is not updated when --disabled is set and a reload is triggered by change:reload binding * Added patch to make test cases work on 0.41.1 Previous request had a mistake in the specfile. This is fixed now. Apologies. OBS-URL: https://build.opensuse.org/request/show/1091756 OBS-URL: https://build.opensuse.org/package/show/utilities/fzf?expand=0&rev=76 --- fix-go-test.patch | 28 ++++++++++++++++++++++++++++ fzf-0.41.0.tar.gz | 3 --- fzf-0.41.1.tar.gz | 3 +++ fzf.changes | 9 +++++++++ fzf.spec | 3 ++- vendor.tar.zst | 4 ++-- 6 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 fix-go-test.patch delete mode 100644 fzf-0.41.0.tar.gz create mode 100644 fzf-0.41.1.tar.gz diff --git a/fix-go-test.patch b/fix-go-test.patch new file mode 100644 index 0000000..cbc9fb3 --- /dev/null +++ b/fix-go-test.patch @@ -0,0 +1,28 @@ +From 448d7e0c5a717128d499f6a09a978b7addd1d925 Mon Sep 17 00:00:00 2001 +From: Junegunn Choi +Date: Sat, 27 May 2023 16:01:30 +0900 +Subject: [PATCH] Update test case + +--- + src/merger_test.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/merger_test.go b/src/merger_test.go +index 5894bea015..5fd1576fd7 100644 +--- a/src/merger_test.go ++++ b/src/merger_test.go +@@ -23,10 +23,10 @@ func randResult() Result { + } + + func TestEmptyMerger(t *testing.T) { +- assert(t, EmptyMerger.Length() == 0, "Not empty") +- assert(t, EmptyMerger.count == 0, "Invalid count") +- assert(t, len(EmptyMerger.lists) == 0, "Invalid lists") +- assert(t, len(EmptyMerger.merged) == 0, "Invalid merged list") ++ assert(t, EmptyMerger(0).Length() == 0, "Not empty") ++ assert(t, EmptyMerger(0).count == 0, "Invalid count") ++ assert(t, len(EmptyMerger(0).lists) == 0, "Invalid lists") ++ assert(t, len(EmptyMerger(0).merged) == 0, "Invalid merged list") + } + + func buildLists(partiallySorted bool) ([][]Result, []Result) { diff --git a/fzf-0.41.0.tar.gz b/fzf-0.41.0.tar.gz deleted file mode 100644 index cb56650..0000000 --- a/fzf-0.41.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12fdaaf0101c053596f98bd4789a048ea47d38c17a95f53a9bac793950cccc87 -size 238237 diff --git a/fzf-0.41.1.tar.gz b/fzf-0.41.1.tar.gz new file mode 100644 index 0000000..b310320 --- /dev/null +++ b/fzf-0.41.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:982682eaac377c8a55ae8d7491fcd0e888d6c13915d01da9ebb6b7c434d7f4b5 +size 238333 diff --git a/fzf.changes b/fzf.changes index 4a6afe9..00e01d5 100644 --- a/fzf.changes +++ b/fzf.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jun 9 03:32:26 UTC 2023 - Joshua Smith + +- Update to version 0.41.1: + * Fixed a bug where preview window is not updated when + --disabled is set and a reload is triggered by change:reload + binding + * Added patch to make test cases work on 0.41.1 + ------------------------------------------------------------------- Fri May 26 18:38:52 UTC 2023 - Avindra Goolcharan diff --git a/fzf.spec b/fzf.spec index 11b8aa2..c1110e6 100644 --- a/fzf.spec +++ b/fzf.spec @@ -18,7 +18,7 @@ %global _lto_cflags %{nil} Name: fzf -Version: 0.41.0 +Version: 0.41.1 Release: 0 Summary: A command-line fuzzy finder License: MIT @@ -26,6 +26,7 @@ Group: Productivity/File utilities URL: https://github.com/junegunn/fzf Source0: https://github.com/junegunn/fzf/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.zst +Patch0: fix-go-test.patch BuildRequires: zstd BuildRequires: golang(API) >= 1.19 diff --git a/vendor.tar.zst b/vendor.tar.zst index 132479d..7be1fdb 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4998f14caf2ddf7c3c704e672ca182357665313ee30eda3d0d20645c4e5c6216 -size 1662344 +oid sha256:13dd686f14ade9712ebe82fb7ac8decb505bb45cedc115f5da1dd03149e60306 +size 1649670