From c3d49fc8961040692bdf4e8c93b23f224eb2a233fbaedf8c66d66f21b6d1c781 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 26 Sep 2019 22:53:15 +0000
Subject: [PATCH] * Mesa-libGLESv3-devel   packages now. Adjusted baselibs.conf
 accordingly.

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

diff --git a/Mesa.changes b/Mesa.changes
index c9d5a26..167ef4c 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -6,9 +6,10 @@ Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
   * Mesa-libEGL-devel
   * Mesa-libGLESv1_CM-devel
   * Mesa-libGLESv2-devel
+  * Mesa-libGLESv3-devel
   Instead of requiring these let Mesa-devel package require 
   libglvnd-devel >= 1.2.0, which provides the contents of these
-  packages now
+  packages now. Adjusted baselibs.conf accordingly.
 
 -------------------------------------------------------------------
 Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
diff --git a/Mesa.spec b/Mesa.spec
index 4c72206..94d3831 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1055,10 +1055,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_libdir}/libGLESv2.so
 %endif
 %{_libdir}/pkgconfig/glesv2.pc
-%endif
 
 %files libGLESv3-devel
 %{_includedir}/GLES3
+%endif
 
 %files -n libOSMesa8
 %{_libdir}/libOSMesa.so.8.0.0
diff --git a/baselibs.conf b/baselibs.conf
index 07f377d..c6d7a3c 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -15,15 +15,11 @@ Mesa
 Mesa-devel
 	#We need Mesa-<targettype>!, do not put requires -Mesa-<targettype>.
 	requires "Mesa-<targettype> = <version>"
-	requires "Mesa-libEGL-devel-<targettype> = <version>"
-	requires "Mesa-libGL-devel-<targettype> = <version>"
-	requires "Mesa-libGLESv1_CM-devel-<targettype> = <version>"
-	requires "Mesa-libGLESv2-devel-<targettype> = <version>"
 	requires "Mesa-libIndirectGL-devel-<targettype> = <version>"
 	requires "Mesa-libglapi-devel-<targettype> = <version>"
 	requires "libOSMesa-devel-<targettype> = <version>"
 	requires "libgbm-devel-<targettype> = <version>"
-	requires "libglvnd-devel-<targettype> >= 0.1.0"
+	requires "libglvnd-devel-<targettype> >= 1.2.0"
 	obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
 	provides  "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
 	obsoletes "Mesa-libIndirectGL-devel-<targettype> < <version>"