From ba297b81e5f41768f685238c1a5156c5c4fff4a39de0491ac78cbf1bf66443bc Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 7 Oct 2019 22:02:22 +0000
Subject: [PATCH] - pickup gl, egl, glesv1_cm and glesv2 pkgconfig files from  
 libglvnd build and add them to the appropriate devel subpackages

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=882
---
 Mesa-drivers.changes |  6 ++++++
 Mesa-drivers.spec    |  9 +++++++--
 Mesa.changes         |  6 ++++++
 Mesa.spec            | 13 +++++++++----
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index fa60e90..759a147 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  7 21:50:32 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- pickup gl, egl, glesv1_cm and glesv2 pkgconfig files from 
+  libglvnd build and add them to the appropriate devel subpackages
+
 -------------------------------------------------------------------
 Mon Oct  7 16:20:49 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index cc18354..a6c8dc9 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -893,6 +893,11 @@ rm -f %{buildroot}%{_libdir}/libGLES*
 ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
 %endif
 
+# pickup pkgconfig files from libglvnd build
+rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc
+install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \
+   %{buildroot}/%{_libdir}/pkgconfig/
+
 for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
  pushd $dir
    xmkmf -a
@@ -1005,7 +1010,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGLESv1_CM.so
 %endif
-%exclude %{_libdir}/pkgconfig/glesv1_cm.pc
+%{_libdir}/pkgconfig/glesv1_cm.pc
 
 %files libGLESv2-2
 %if 0%{?libglvnd} == 0
@@ -1017,7 +1022,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGLESv2.so
 %endif
-%exclude %{_libdir}/pkgconfig/glesv2.pc
+%{_libdir}/pkgconfig/glesv2.pc
 
 %files libGLESv3-devel
 %{_includedir}/GLES3
diff --git a/Mesa.changes b/Mesa.changes
index fa60e90..759a147 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  7 21:50:32 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- pickup gl, egl, glesv1_cm and glesv2 pkgconfig files from 
+  libglvnd build and add them to the appropriate devel subpackages
+
 -------------------------------------------------------------------
 Mon Oct  7 16:20:49 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 5a93e19..43f5aab 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -892,6 +892,11 @@ rm -f %{buildroot}%{_libdir}/libGLES*
 ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
 %endif
 
+# pickup pkgconfig files from libglvnd build
+rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc
+install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \
+   %{buildroot}/%{_libdir}/pkgconfig/
+
 for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
  pushd $dir
    xmkmf -a
@@ -970,7 +975,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if !0%{?libglvnd}
 %{_libdir}/libEGL.so
 %endif
-%exclude %{_libdir}/pkgconfig/egl.pc
+%{_libdir}/pkgconfig/egl.pc
 
 %files KHR-devel
 %dir %{_includedir}/KHR
@@ -991,7 +996,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGL.so
 %endif
-%exclude %{_libdir}/pkgconfig/gl.pc
+%{_libdir}/pkgconfig/gl.pc
 %{_mandir}/man3/gl[A-Z]*
 
 %files libGLESv1_CM1
@@ -1004,7 +1009,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGLESv1_CM.so
 %endif
-%exclude %{_libdir}/pkgconfig/glesv1_cm.pc
+%{_libdir}/pkgconfig/glesv1_cm.pc
 
 %files libGLESv2-2
 %if 0%{?libglvnd} == 0
@@ -1016,7 +1021,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGLESv2.so
 %endif
-%exclude %{_libdir}/pkgconfig/glesv2.pc
+%{_libdir}/pkgconfig/glesv2.pc
 
 %files libGLESv3-devel
 %{_includedir}/GLES3