From 7996f46a83d2ec434f4639fea1db8a29478e652db5f9032960421a4a6032a5b9 Mon Sep 17 00:00:00 2001 From: Avindra Goolcharan Date: Fri, 19 Apr 2019 01:56:36 +0000 Subject: [PATCH] Accepting request 695845 from home:mcepl:branches:utilities - Update to 0.18.0: - 0.18.0 - Added placeholder expression for zero-based item index: {n} and {+n} fzf --preview 'echo {n}: {}' - Added color option for the gutter: --color gutter:-1 - Added --no-unicode option for drawing borders in non-Unicode, ASCII characters - FZF_PREVIEW_LINES and FZF_PREVIEW_COLUMNS are exported to preview process fzf still overrides LINES and COLUMNS as before, but they may be reset by the default shell. - Bug fixes and improvements See https://github.com/junegunn/fzf/milestone/14?closed=1 - Update to 0.17.5: - Bug fixes and improvements See https://github.com/junegunn/fzf/milestone/13?closed=1 - Search query longer than the screen width is allowed (up to 300 chars) OBS-URL: https://build.opensuse.org/request/show/695845 OBS-URL: https://build.opensuse.org/package/show/utilities/fzf?expand=0&rev=6 --- build-mode-pie.patch | 11 ----------- fzf-0.17.4.tar.gz | 3 --- fzf-0.18.0.tar.gz | 3 +++ fzf.changes | 21 +++++++++++++++++++++ fzf.spec | 29 +++++++++++++++++++---------- vendor.tar.xz | 4 ++-- 6 files changed, 45 insertions(+), 26 deletions(-) delete mode 100644 build-mode-pie.patch delete mode 100644 fzf-0.17.4.tar.gz create mode 100644 fzf-0.18.0.tar.gz diff --git a/build-mode-pie.patch b/build-mode-pie.patch deleted file mode 100644 index 510a8ff..0000000 --- a/build-mode-pie.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2018-04-01 12:31:18.017762591 -0400 -+++ b/Makefile 2018-04-01 12:31:26.105558798 -0400 -@@ -21,7 +21,7 @@ - SOURCES := $(wildcard *.go src/*.go src/*/*.go) $(SRC_LINK) $(VENDOR_LINK) $(GLIDE_LOCK) $(MAKEFILE) - - REVISION := $(shell git log -n 1 --pretty=format:%h -- $(SOURCES)) --BUILD_FLAGS := -a -ldflags "-X main.revision=$(REVISION) -w -extldflags=$(LDFLAGS)" -tags "$(TAGS)" -+BUILD_FLAGS := -buildmode=pie -a -ldflags "-X main.revision=$(REVISION) -w -extldflags=$(LDFLAGS)" -tags "$(TAGS)" - - BINARY32 := fzf-$(GOOS)_386 - BINARY64 := fzf-$(GOOS)_amd64 diff --git a/fzf-0.17.4.tar.gz b/fzf-0.17.4.tar.gz deleted file mode 100644 index dd3f33c..0000000 --- a/fzf-0.17.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4b009638266b116f422d159cd1e09df64112e6ae3490964db2cd46636981ff0 -size 140100 diff --git a/fzf-0.18.0.tar.gz b/fzf-0.18.0.tar.gz new file mode 100644 index 0000000..8aea809 --- /dev/null +++ b/fzf-0.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5406d181785ea17b007544082b972ae004b62fb19cdb41f25e265ea3cc8c2d9d +size 143243 diff --git a/fzf.changes b/fzf.changes index 0552c5c..a1af4ef 100644 --- a/fzf.changes +++ b/fzf.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Apr 18 21:21:59 CEST 2019 - Matej Cepl + +- Update to 0.18.0: + - 0.18.0 + - Added placeholder expression for zero-based item index: {n} + and {+n} fzf --preview 'echo {n}: {}' + - Added color option for the gutter: --color gutter:-1 + - Added --no-unicode option for drawing borders in + non-Unicode, ASCII characters + - FZF_PREVIEW_LINES and FZF_PREVIEW_COLUMNS are exported to + preview process fzf still overrides LINES and COLUMNS as + before, but they may be reset by the default shell. + - Bug fixes and improvements See + https://github.com/junegunn/fzf/milestone/14?closed=1 + - Update to 0.17.5: + - Bug fixes and improvements See + https://github.com/junegunn/fzf/milestone/13?closed=1 + - Search query longer than the screen width is allowed (up to + 300 chars) + ------------------------------------------------------------------- Thu Dec 20 00:27:29 UTC 2018 - Matej Cepl diff --git a/fzf.spec b/fzf.spec index 1b2f0b8..a60f8a4 100644 --- a/fzf.spec +++ b/fzf.spec @@ -1,7 +1,7 @@ # # spec file for package fzf # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: fzf -Version: 0.17.4 +Version: 0.18.0 Release: 0 Summary: A command-line fuzzy finder License: MIT Group: Productivity/File utilities URL: https://github.com/junegunn/fzf Source0: https://github.com/junegunn/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Run go build && go mod vendor to get vendor/ subdirectory Source1: vendor.tar.xz -# PATCH-FIX-SUSE Build a position independent executable -Patch0: build-mode-pie.patch -BuildRequires: golang(API) >= 1.7 +BuildRequires: golang(API) >= 1.12 %description fzf is an interactive Unix filter for command-line that can be used with any list; files, @@ -35,6 +34,7 @@ command history, processes, hostnames, bookmarks, git commits, etc. %package tmux Summary: Tmux integration for fzf +Group: Productivity/File utilities Supplements: packageand(fzf:tmux) BuildArch: noarch @@ -44,6 +44,7 @@ separate tmux pane. %package bash-completion Summary: Bash completion for fzf +Group: Productivity/File utilities Requires: bash-completion Supplements: packageand(fzf:bash) BuildArch: noarch @@ -53,6 +54,7 @@ Bash shell completions for fzf %package zsh-completion Summary: ZSH completion for fzf +Group: Productivity/File utilities Supplements: packageand(fzf:zsh) BuildArch: noarch @@ -63,6 +65,7 @@ zsh shell completions for fzf %package -n vim-fzf Summary: Vim plugin for fzf +Group: Productivity/File utilities BuildArch: noarch %description -n vim-fzf @@ -70,16 +73,22 @@ Plugin for vim allowing use of fzf. %prep %setup -q -a1 -%patch0 -p1 +tar xf %{SOURCE1} # fix E: env-script-interpreter sed -i 's,#!%{_bindir}/env ,#!/bin/,' ./bin/fzf-tmux %build -make %{?_smp_mflags} +export GOCACHE=$(readlink -f vendor/) +%ifarch ppc64 +BUILDMOD="" +%else +BUILDMOD="-buildmode=pie" +%endif +export RPM_OPT_FLAGS="%{optflags}" +go build -v -x -mod=vendor $BUILDMOD -a -ldflags "-X main.revision=%{version}" %install -make bin/fzf -install -Dm755 bin/fzf %{buildroot}%{_bindir}/fzf +install -Dm755 fzf %{buildroot}%{_bindir}/fzf install -Dm755 bin/fzf-tmux %{buildroot}%{_bindir}/fzf-tmux install -Dm644 man/man1/fzf.1 %{buildroot}%{_mandir}/man1/fzf.1 install -Dm644 man/man1/fzf-tmux.1 %{buildroot}%{_mandir}/man1/fzf-tmux.1 diff --git a/vendor.tar.xz b/vendor.tar.xz index c793c3a..5580eb8 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae8a97ccf00efb2fd60fa927f95f23852c9f8ff8f8f585c4aa4130818d8166ee -size 9106212 +oid sha256:71c8bafa62c0984f2945e7a326882244f15a6b3a5922cb1cc3e1b30efde91b9c +size 583968