From 81f3b5b6d8f47d7d8b594ab86e99de63eed88bd594d651773817c35d99edc832 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 17 Jun 2016 14:19:40 +0000
Subject: [PATCH] - let Mesa-libVulkan-devel conflict with vulkan-devel due to
 file   conflics in both packages

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=528
---
 Mesa.changes | 6 ++++++
 Mesa.spec    | 1 +
 2 files changed, 7 insertions(+)

diff --git a/Mesa.changes b/Mesa.changes
index 00ddadc..1c2630e 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 17 14:12:52 UTC 2016 - sndirsch@suse.com
+
+- let Mesa-libVulkan-devel conflict with vulkan-devel due to file
+  conflics in both packages
+
 -------------------------------------------------------------------
 Wed Jun 15 14:39:32 UTC 2016 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 74d47d8..e678a57 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -559,6 +559,7 @@ This package contains the Vulkan parts for Mesa.
 Summary:        Mesas Vulkan development files
 Group:          Development/Libraries/C and C++
 Requires:       libvulkan_intel = %{version}
+Conflicts:      vulkan-devel
 
 %description libVulkan-devel
 This package contains the development files for Mesas Vulkan implementation.