From aa86635c966322bda62bb40e80caa11064f318670d06fde98732d4f10d009f31 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 27 Jun 2022 12:37:54 +0000 Subject: [PATCH 1/3] Accepting request 985151 from home:stimut:branches:devel:tools:scm - Split out tig-bash-completion package * Removes dependency on bash-completion from main tig package - Add tig-zsh-completion package OBS-URL: https://build.opensuse.org/request/show/985151 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/tig?expand=0&rev=73 --- tig.changes | 7 +++++++ tig.spec | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/tig.changes b/tig.changes index a5fa05a..a5b5f69 100644 --- a/tig.changes +++ b/tig.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jun 26 13:18:06 UTC 2022 - Timothy Brown + +- Split out tig-bash-completion package + * Removes dependency on bash-completion from main tig package +- Add tig-zsh-completion package + ------------------------------------------------------------------- Thu Jan 13 13:59:25 UTC 2022 - Michael Vetter diff --git a/tig.spec b/tig.spec index 141a534..121c4cc 100644 --- a/tig.spec +++ b/tig.spec @@ -27,7 +27,6 @@ Source0: https://github.com/jonas/tig/releases/download/%{name}-%{version BuildRequires: pkgconfig >= 0.9.0 BuildRequires: readline-devel >= 6.3 BuildRequires: pkgconfig(ncurses) -Requires: bash-completion Requires: git-core %description @@ -40,6 +39,31 @@ and showing the commit with the log message, diffstat, and the diff. Using it as a pager, it will display input from stdin and colorize it. +%package bash-completion +Summary: Bash completion for %{name} +Requires: bash-completion +%if 0%{?sle_version} == 120500 +Supplements: packageand(%{name}:bash) +%else +Supplements: (%{name} and bash) +%endif +BuildArch: noarch + +%description bash-completion +Bash command line completion support for %{name}. + +%package zsh-completion +Summary: Zsh completion for %{name} +%if 0%{?sle_version} == 120500 +Supplements: packageand(%{name}:zsh) +%else +Supplements: (%{name} and zsh) +%endif +BuildArch: noarch + +%description zsh-completion +Zsh command line completion support for %{name}. + %prep %setup -q @@ -53,6 +77,10 @@ Using it as a pager, it will display input from stdin and colorize it. %make_install install-doc-man install -Dpm 0644 contrib/tig-completion.bash \ %{buildroot}%{_datadir}/bash-completion/completions/%{name} +install -Dpm 0644 contrib/tig-completion.bash \ + %{buildroot}%{_datadir}/zsh/site-functions/%{name}-completion.bash +install -Dpm 0644 contrib/tig-completion.zsh \ + %{buildroot}%{_datadir}/zsh/site-functions/_%{name} %files %license COPYING @@ -63,6 +91,11 @@ install -Dpm 0644 contrib/tig-completion.bash \ %{_mandir}/man1/tig.1%{?ext_man} %{_mandir}/man5/tigrc.5%{?ext_man} %{_mandir}/man7/tigmanual.7%{?ext_man} -%{_datadir}/bash-completion/completions/%{name} + +%files bash-completion +%{_datadir}/bash-completion + +%files zsh-completion +%{_datadir}/zsh %changelog From 28ac43457ecc53fa2ab88ecfe598f25d5af4de53be335258bebdcb5655863b6f Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 13 Jul 2022 07:46:58 +0000 Subject: [PATCH 2/3] Accepting request 988908 from home:jubalh:branches:devel:tools:scm - Update to 2.5.6: * Fix :goto . (#1178) * Fix typo in ui.c. * Revert terminal hacks and workarounds. (#748, #943, #1180, #1182) * Fix opening of an ambiguous ref in refs view. * Fix search when view is loading. * Use the full width for diffstat in the stage view. * Improve escaping of variables in external commands. * Fix cursor behaviour during staging. (#842, #1028) * Fix navigation in split tree view. * Enable textconv in the stage view. * Enable textconv in the blame view and fix blame -L. (#978, #1189) * Update lineno for untracked files. (#1192) * Fix alignment of transliterated text. (#1195) * Fix word diff in the stage, stash and blame views. (#1207) * Fix reading the value of status.showUntrackedFiles. (#1211) * Honor commit_title:no in view settings. * Fix segfault with PCRE. OBS-URL: https://build.opensuse.org/request/show/988908 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/tig?expand=0&rev=74 --- tig-2.5.5.tar.gz | 3 --- tig-2.5.6.tar.gz | 3 +++ tig.changes | 22 ++++++++++++++++++++++ tig.spec | 4 +++- 4 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 tig-2.5.5.tar.gz create mode 100644 tig-2.5.6.tar.gz diff --git a/tig-2.5.5.tar.gz b/tig-2.5.5.tar.gz deleted file mode 100644 index 9dd1e4a..0000000 --- a/tig-2.5.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24ba2c8beae889e6002ea7ced0e29851dee57c27fde8480fb9c64d5eb8765313 -size 1175752 diff --git a/tig-2.5.6.tar.gz b/tig-2.5.6.tar.gz new file mode 100644 index 0000000..46e8c32 --- /dev/null +++ b/tig-2.5.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50bb5f33369b50b77748115c730c52b13e79b2de49cba7167bb634eb683d965f +size 1176006 diff --git a/tig.changes b/tig.changes index a5b5f69..c39013d 100644 --- a/tig.changes +++ b/tig.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Jul 13 07:15:57 UTC 2022 - Michael Vetter + +- Update to 2.5.6: + * Fix :goto . (#1178) + * Fix typo in ui.c. + * Revert terminal hacks and workarounds. (#748, #943, #1180, #1182) + * Fix opening of an ambiguous ref in refs view. + * Fix search when view is loading. + * Use the full width for diffstat in the stage view. + * Improve escaping of variables in external commands. + * Fix cursor behaviour during staging. (#842, #1028) + * Fix navigation in split tree view. + * Enable textconv in the stage view. + * Enable textconv in the blame view and fix blame -L. (#978, #1189) + * Update lineno for untracked files. (#1192) + * Fix alignment of transliterated text. (#1195) + * Fix word diff in the stage, stash and blame views. (#1207) + * Fix reading the value of status.showUntrackedFiles. (#1211) + * Honor commit_title:no in view settings. + * Fix segfault with PCRE. + ------------------------------------------------------------------- Sun Jun 26 13:18:06 UTC 2022 - Timothy Brown diff --git a/tig.spec b/tig.spec index 121c4cc..1798ce9 100644 --- a/tig.spec +++ b/tig.spec @@ -17,7 +17,7 @@ Name: tig -Version: 2.5.5 +Version: 2.5.6 Release: 0 Summary: An ncurses-based text-mode interface for git License: GPL-2.0-or-later @@ -41,6 +41,7 @@ Using it as a pager, it will display input from stdin and colorize it. %package bash-completion Summary: Bash completion for %{name} +Group: Development/Tools/Version Control Requires: bash-completion %if 0%{?sle_version} == 120500 Supplements: packageand(%{name}:bash) @@ -54,6 +55,7 @@ Bash command line completion support for %{name}. %package zsh-completion Summary: Zsh completion for %{name} +Group: Development/Tools/Version Control %if 0%{?sle_version} == 120500 Supplements: packageand(%{name}:zsh) %else From 9ec3fe5430f3db7547db65ac4d503273de4320f1c8255ac1553078c959fb6305 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 14 Jul 2022 07:40:28 +0000 Subject: [PATCH 3/3] Accepting request 989050 from home:AndreasStieger:branches:devel:tools:scm - tig 2.5.5 added pcre2 support. Actually build with it. - fix bash and zsh completion packaging for Factory OBS-URL: https://build.opensuse.org/request/show/989050 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/tig?expand=0&rev=75 --- tig.changes | 6 ++++++ tig.spec | 18 ++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tig.changes b/tig.changes index c39013d..94f442a 100644 --- a/tig.changes +++ b/tig.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 13 20:31:12 UTC 2022 - Andreas Stieger + +- tig 2.5.5 added pcre2 support. Actually build with it. +- fix bash and zsh completion packaging for Factory + ------------------------------------------------------------------- Wed Jul 13 07:15:57 UTC 2022 - Michael Vetter diff --git a/tig.spec b/tig.spec index 1798ce9..68a69aa 100644 --- a/tig.spec +++ b/tig.spec @@ -26,6 +26,7 @@ URL: https://jonas.github.io/tig/ Source0: https://github.com/jonas/tig/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: pkgconfig >= 0.9.0 BuildRequires: readline-devel >= 6.3 +BuildRequires: pkgconfig(libpcre2-posix) BuildRequires: pkgconfig(ncurses) Requires: git-core @@ -42,12 +43,9 @@ Using it as a pager, it will display input from stdin and colorize it. %package bash-completion Summary: Bash completion for %{name} Group: Development/Tools/Version Control +Requires: %{name} = %{version} Requires: bash-completion -%if 0%{?sle_version} == 120500 -Supplements: packageand(%{name}:bash) -%else -Supplements: (%{name} and bash) -%endif +Supplements: (%{name} and bash-completion) BuildArch: noarch %description bash-completion @@ -56,18 +54,16 @@ Bash command line completion support for %{name}. %package zsh-completion Summary: Zsh completion for %{name} Group: Development/Tools/Version Control -%if 0%{?sle_version} == 120500 -Supplements: packageand(%{name}:zsh) -%else +Requires: %{name} = %{version} +Requires: zsh Supplements: (%{name} and zsh) -%endif BuildArch: noarch %description zsh-completion Zsh command line completion support for %{name}. %prep -%setup -q +%autosetup -p1 %build %configure \ @@ -95,9 +91,11 @@ install -Dpm 0644 contrib/tig-completion.zsh \ %{_mandir}/man7/tigmanual.7%{?ext_man} %files bash-completion +%license COPYING %{_datadir}/bash-completion %files zsh-completion +%license COPYING %{_datadir}/zsh %changelog