diff --git a/.gitignore b/.gitignore index f44916e..7321f4e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /fzf-0.24.3.tar.gz /fzf-0.24.4.tar.gz /fzf-0.25.0.tar.gz +/fzf-0.25.1.tar.gz diff --git a/0001-Use-more-explicit-int-to-string-conversion.patch b/0001-Use-more-explicit-int-to-string-conversion.patch deleted file mode 100644 index 8d63011..0000000 --- a/0001-Use-more-explicit-int-to-string-conversion.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cab32ead2291fdbe5f5c284c71a693705533c700 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Sat, 2 Jan 2021 23:25:43 -0500 -Subject: [PATCH] Use more explicit int-to-string conversion. - -This fixes the following errors with Go 1.15: -``` -src/options.go:452:69: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?) -src/options.go:463:33: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?) -``` - -Signed-off-by: Elliott Sales de Andrade ---- - src/options.go | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/options.go b/src/options.go -index 12c0955..cee11ff 100644 ---- a/src/options.go -+++ b/src/options.go -@@ -449,7 +449,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string { - errorExit(message) - } - -- str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string(escapedComma)) -+ str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string([]rune{escapedComma})) - tokens := strings.Split(str, ",") - if str == "," || strings.HasPrefix(str, ",,") || strings.HasSuffix(str, ",,") || strings.Contains(str, ",,,") { - tokens = append(tokens, ",") -@@ -460,7 +460,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string { - if len(key) == 0 { - continue // ignore - } -- key = strings.ReplaceAll(key, string(escapedComma), ",") -+ key = strings.ReplaceAll(key, string([]rune{escapedComma}), ",") - lkey := strings.ToLower(key) - add := func(e tui.EventType) { - chords[e.AsEvent()] = key --- -2.29.2 - diff --git a/fzf.spec b/fzf.spec index 9d93665..eaca411 100644 --- a/fzf.spec +++ b/fzf.spec @@ -2,21 +2,19 @@ # https://github.com/junegunn/fzf %global goipath github.com/junegunn/fzf -Version: 0.25.0 +Version: 0.25.1 %global tag %{version} %gometa Name: fzf -Release: 2%{?dist} +Release: 1%{?dist} Summary: A command-line fuzzy finder written in Go License: MIT URL: %{gourl} Source0: %{gosource} Source1: README.Fedora -# https://github.com/junegunn/fzf/pull/2305 -Patch0001: 0001-Use-more-explicit-int-to-string-conversion.patch BuildRequires: golang(github.com/gdamore/tcell) >= 1.4 BuildRequires: golang(github.com/gdamore/tcell/encoding) @@ -37,7 +35,6 @@ etc. %prep %goprep cp %{SOURCE1} . -%patch0001 -p1 %build @@ -100,6 +97,9 @@ install -Dpm0644 shell/key-bindings.* %{buildroot}%{_datadir}/fzf/shell/ %changelog +* Fri Feb 05 2021 Elliott Sales de Andrade - 0.25.1-1 +- Update to latest version (#1924749) + * Tue Jan 26 2021 Fedora Release Engineering - 0.25.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 5bfd454..370a7e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fzf-0.25.0.tar.gz) = 73b65374334531ac81a64bb973cb976f4dab7c6458eb2705f323349223880294fa6238b0eeea3412ff121c5c1b70905b261ceb7994c2b00425b02c88286b36e3 +SHA512 (fzf-0.25.1.tar.gz) = 755046b4a8604fd3d1f2b66b967ad79cf5d4581dba1e40abed338c767d4421620df0f1f6a81a6c22c20da54dfdb1ff6847bad8f58ed83fc5e1928038c9d042f2