From a2a9088030d1fe3774a357a1135f3b792ff9462e26da71b1e808c0bd131c9b1a Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 5 Nov 2019 10:20:56 +0000
Subject: [PATCH] Accepting request 745331 from home:pluskalm:branches:X11:XOrg

- Dont conflict with vulkan-devel anymore as there is no file
  conflict

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

diff --git a/Mesa.changes b/Mesa.changes
index 18038f2..40f08b7 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov  5 07:45:37 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
+
+- Dont conflict with vulkan-devel anymore as there is no file
+  conflict
+
 -------------------------------------------------------------------
 Fri Nov  1 17:07:44 UTC 2019 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/Mesa.spec b/Mesa.spec
index 5b2f399..5a389a2 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -689,7 +689,6 @@ Summary:        Mesa's Vulkan development files
 Group:          Development/Libraries/C and C++
 Requires:       libvulkan_intel = %{version}
 Requires:       libvulkan_radeon = %{version}
-Conflicts:      vulkan-devel
 
 %description -n Mesa-libVulkan-devel
 This package contains the development files for Mesa's Vulkan implementation.