[packages/fzf] sync fzf-git.sh with upstream and drop awk patch
atler
atler at pld-linux.org
Fri Sep 30 10:20:32 CEST 2022
commit 45c96c4f70a253d1dbce07cf46ab3a98161ef527
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Sep 30 10:19:20 2022 +0200
sync fzf-git.sh with upstream and drop awk patch
awk fix applied upstream
fzf-git-awk.patch | 11 -----------
fzf.spec | 12 ++++--------
2 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/fzf.spec b/fzf.spec
index f65f6cf..a0f3520 100644
--- a/fzf.spec
+++ b/fzf.spec
@@ -3,7 +3,7 @@
%define fzfrev 04d0b02
%define fzfvimrev 9ceac71
-%define fzfgitrev a48b941
+%define fzfgitrev 9190e1b
%define vendor_version 0.34.0
Summary: A command-line fuzzy finder written in Go
@@ -24,9 +24,8 @@ Source1: %{name}-vendor-%{vendor_version}.tar.xz
Source2: https://github.com/junegunn/fzf.vim/archive/%{fzfvimrev}/fzf.vim-%{fzfvimrev}.tar.gz
# Source2-md5: cf33165a5e500c85838fa994683b2e5d
Source3: https://github.com/junegunn/fzf-git.sh/archive/%{fzfgitrev}/fzf-git.sh-%{fzfgitrev}.tar.gz
-# Source3-md5: 672c3efba11c015c5d282562553eac07
-Patch0: fzf-git-awk.patch
-Patch1: install.patch
+# Source3-md5: 66a5b104f7e6f67c0b4f8556f1a22583
+Patch0: install.patch
URL: https://github.com/junegunn/fzf
BuildRequires: golang >= 1.13
BuildRequires: rpm-build >= 4.6
@@ -120,10 +119,7 @@ Documentation for fzf Vim plugin.
%{__mv} fzf-%{vendor_version}/vendor .
%{__mv} fzf.vim-%{fzfvimrev}* fzf.vim
%{__mv} fzf-git.sh-%{fzfgitrev}* fzf-git
-cd fzf-git
-%patch0
-cd ..
-%patch1 -p1
+%patch0 -p1
%{__sed} -i -e "s at let s:bin_dir = .*@let s:bin_dir = '%{_datadir}/fzf/vim/bin/'@" fzf.vim/autoload/fzf/vim.vim
%{__sed} -i -e '1s,.*env bash,#!/bin/bash,' fzf.vim/bin/preview.sh bin/fzf-tmux install
%{__sed} -i -e '1s,.*env perl,#!%{__perl},' fzf.vim/bin/tags.pl
diff --git a/fzf-git-awk.patch b/fzf-git-awk.patch
deleted file mode 100644
index 213ba37..0000000
--- a/fzf-git-awk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fzf-git.sh.orig 2022-09-06 04:47:02.000000000 +0200
-+++ fzf-git.sh 2022-09-29 02:21:14.222705635 +0200
-@@ -180,7 +180,7 @@
- --bind 'ctrl-d:execute:grep -o "[a-f0-9]\{7,\}" <<< {} | head -n 1 | xargs git diff > /dev/tty' \
- --color hl:underline,hl+:underline \
- --preview 'grep -o "[a-f0-9]\{7,\}" <<< {} | head -n 1 | xargs git show --color=always' "$@" |
-- awk 'match($0, /[a-f0-9]{7,}/) { print substr($0, RSTART, RLENGTH) }'
-+ awk 'match($0, /[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*/) { print substr($0, RSTART, RLENGTH) }'
- }
-
- _fzf_git_remotes() {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fzf.git/commitdiff/45c96c4f70a253d1dbce07cf46ab3a98161ef527
More information about the pld-cvs-commit
mailing list