From d233ce0d4b4854c048c16c51081b398e779bdf23 Mon Sep 17 00:00:00 2001
From: Vinzenz Feenstra <vfeenstr@redhat.com>
Date: Jun 21 2018 08:12:12 +0000
Subject: origin-clients Conflicts kubernetes-client rhbz#1420394


Adding Conflicts clause for origin-clients to conflict with kubernetes-client

Resolves: rhbz#1420394

---

diff --git a/origin.spec b/origin.spec
index 85fb97d..9c4c799 100644
--- a/origin.spec
+++ b/origin.spec
@@ -2061,6 +2061,9 @@ Obsoletes:      openshift-clients < %{package_refector_version}
 Requires:       git
 Requires:       bash-completion
 
+# /usr/bin/kubectl is provided by kubernetes-client as well as origin-clients
+Conflicts:      kubernetes-client
+
 %description clients
 %{summary}