diff --git a/ugrep-4.3.6.tar.gz b/ugrep-4.3.6.tar.gz deleted file mode 100644 index 01fdd70..0000000 --- a/ugrep-4.3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39f3205a2b8b79eeb6d2eaf1727c68262010e06ba5a7c42d5164c7ed6b6822f2 -size 4445771 diff --git a/ugrep-4.4.1-remove-shebang-from-bash-completion.patch b/ugrep-4.4.1-remove-shebang-from-bash-completion.patch new file mode 100644 index 0000000..928bdec --- /dev/null +++ b/ugrep-4.4.1-remove-shebang-from-bash-completion.patch @@ -0,0 +1,20 @@ +From 8f4ced87032edd356a94ce9e5a2786d89f75e14a Mon Sep 17 00:00:00 2001 +From: Andreas Stieger +Date: Tue, 19 Dec 2023 19:27:32 +0100 +Subject: [PATCH] remove shebang from bash completion script +References: https://github.com/Genivia/ugrep/pull/338 + +--- + completions/bash/ug | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/completions/bash/ug b/completions/bash/ug +index 540b65ce..376575cc 100755 +--- a/completions/bash/ug ++++ b/completions/bash/ug +@@ -1,4 +1,3 @@ +-#!/usr/bin/env bash + # bash completion for ug and ugrep + # recommended: add the following lines to ~/.inputrc + # set colored-stats on + diff --git a/ugrep-4.4.1.tar.gz b/ugrep-4.4.1.tar.gz new file mode 100644 index 0000000..71aa22a --- /dev/null +++ b/ugrep-4.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e134f5080412dec8023ca8d10433c4860e95557c1ac05140285a203b06ebab61 +size 5957895 diff --git a/ugrep.changes b/ugrep.changes index b179e74..d14ea99 100644 --- a/ugrep.changes +++ b/ugrep.changes @@ -1,7 +1,22 @@ +------------------------------------------------------------------- +Tue Dec 19 17:46:14 UTC 2023 - Andreas Stieger + +- 4.4.1 + * ship shell completions (bash,zsh,fish) + * option -t (--file-type) now also accepts filename extensions as + shortcuts, when unambiguous, for example, the shorter form -tpy + for -tpython to select files to search + * TUI ALT-SHIFT-% switches between "bool query lines" mode, + "bool query files" mode, and bool queries off + TUI boolF mode (-%FQ) now applies syntax highlighting + * support legacy grep long options without = to bind option + arguments +- add ugrep-4.4.1-remove-shebang-from-bash-completion.patch + ------------------------------------------------------------------- Sat Dec 9 00:00:41 UTC 2023 - Andreas Stieger -- update to 3.4.6: +- update to 4.3.6: * fix an issue with option -Zbest fuzzy matching * updated option --index for accelerated index-based search, now also indexes and searches archives and compressed files with diff --git a/ugrep.spec b/ugrep.spec index ddc2629..470fae8 100644 --- a/ugrep.spec +++ b/ugrep.spec @@ -17,13 +17,15 @@ Name: ugrep -Version: 4.3.6 +Version: 4.4.1 Release: 0 Summary: Universal grep: a feature-rich grep implementation with focus on speed License: BSD-3-Clause Group: Productivity/File utilities URL: https://github.com/Genivia/ugrep Source: https://github.com/Genivia/ugrep/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: ugrep-4.4.1-remove-shebang-from-bash-completion.patch +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(bzip2) @@ -34,7 +36,7 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(zlib) # the bzip3 version seems to old, the tests break with decompression errors -%if 0%{?suse_version} >= 1600 +%if 0%{?suse_version} > 1599 BuildRequires: pkgconfig(bzip3) %endif @@ -43,6 +45,41 @@ Ugrep supports an interactive query UI and can search file systems, source code, text, binary files, archives, compressed files, documents and use fuzzy search. +%package bash-completion +Summary: Bash completion for ugrep +Requires: %{name} = %{version} +Requires: bash-completion +Supplements: (%{name} and bash-completion) +BuildArch: noarch + +%description bash-completion + +This package contains the bash completion for ugrep. + +%package zsh-completion +Summary: Zsh completion for ugrep +BuildRequires: zsh +Requires: %{name} = %{version} +Requires: zsh +Supplements: (%{name} and zsh) +BuildArch: noarch + +%description zsh-completion + +This package contains the zsh completion for ugrep. + +%package fish-completion +Summary: Fish completion for ugrep +BuildRequires: fish +Requires: %{name} = %{version} +Requires: fish +Supplements: (%{name} and fish) +BuildArch: noarch + +%description fish-completion + +This package contains the fish completion for ugrep. + %prep %autosetup -p1 @@ -50,7 +87,7 @@ fuzzy search. %configure \ --disable-avx \ --enable-color \ -%if 0%{?suse_version} >= 1600 +%if 0%{?suse_version} > 1599 --with-bzip3 \ %endif %{nil} @@ -58,6 +95,7 @@ fuzzy search. %install %make_install +%fdupes %{buildroot}%{_datadir}/%{name} %check %make_build test @@ -69,4 +107,16 @@ fuzzy search. %{_mandir}/man1/*.1%{?ext_man} %{_datadir}/ugrep +%files bash-completion +%license LICENSE.txt +%{_datadir}/bash-completion/completions/* + +%files zsh-completion +%license LICENSE.txt +%{_datadir}/zsh/site-functions/* + +%files fish-completion +%license LICENSE.txt +%{_datadir}/fish/vendor_completions.d/*.fish + %changelog