From 625c012a6bfdb43eb2a952822d9fcd8c5203a81b917172b2d227320a09de5a35 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Wed, 23 Dec 2020 06:43:09 +0000
Subject: [PATCH] Accepting request 858292 from home:cyphar:docker

- Add Conflicts and Provides for kubic flavour of Docker.

OBS-URL: https://build.opensuse.org/request/show/858292
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=349
---
 docker.changes | 5 +++++
 docker.spec    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/docker.changes b/docker.changes
index 08170cc..9c798b6 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 23 06:40:46 UTC 2020 - Aleksa Sarai <asarai@suse.com>
+
+- Add Conflicts and Provides for kubic flavour of Docker.
+
 -------------------------------------------------------------------
 Mon Dec 21 07:06:53 UTC 2020 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/docker.spec b/docker.spec
index 9ff61c6..f647c92 100644
--- a/docker.spec
+++ b/docker.spec
@@ -223,6 +223,11 @@ Group:          System/Shells
 Requires:       %{name} = %{version}
 Supplements:    packageand(%{name}:fish)
 BuildArch:      noarch
+%if "%flavour" == "kubic"
+# Conflict with non-kubic package, and provide equivalent
+Conflicts:      %{realname}-fish-completion
+Provides:       %{realname}-fish-completion = %{version}
+%endif
 
 %description fish-completion
 Fish command line completion support for %{name}.