From dea9cdecad1a39b77d5f5fc1039e1d901de69efb9ea0e924dc33cc26f6cca105 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 5 Nov 2019 16:04:37 +0000
Subject: [PATCH] sync Mesa.spec and Mesa-drivers.spec

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

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 18038f2..40f08b7 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.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-drivers.spec b/Mesa-drivers.spec
index fca9a45..e225be9 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -690,7 +690,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.