From 9ec3fe5430f3db7547db65ac4d503273de4320f1c8255ac1553078c959fb6305 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Thu, 14 Jul 2022 07:40:28 +0000
Subject: [PATCH] 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 <andreas.stieger@gmx.de>
+
+- 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 <mvetter@suse.com>
 
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