--- cauldron/mesa/current/SPECS/mesa.spec	2018/12/08 13:09:53	1338948
+++ cauldron/mesa/current/SPECS/mesa.spec	2018/12/10 09:14:31	1339667
@@ -66,6 +66,7 @@
 
 %define dridrivers		%mklibname dri-drivers
 
+%define khrdevel		%mklibname mesakhr -d
 %define osmesadevel		%mklibname osmesa -d
 
 # Architecture-independent Virtual provides:
@@ -80,8 +81,6 @@
 %define libwaylandeglname_virt	lib%{waylandeglname}
 %define libxaname_virt		lib%{xaname}
 
-%define oldlibglname		%mklibname MesaGL 1
-
 %define mesasrcdir		%{_prefix}/src/Mesa/
 
 %define with_vaapi 1
@@ -189,8 +188,6 @@
 %package -n	%{libglname}
 Summary:	Files for Mesa (GL and GLX libs)
 Group:		System/Libraries
-Obsoletes:	%{oldlibglname} < 6.4
-Provides:	%{oldlibglname} = %{version}-%{release}
 Provides:	%{libglname_virt} = %{version}-%{release}
 Requires:	%{dridrivers} >= %{version}-%{release}
 
@@ -225,11 +222,10 @@
 Summary:	Development files for Mesa (OpenGL compatible 3D lib)
 Group:		Development/C
 Requires:	%{libglname} = %{version}-%{release}
+Requires:	%{khrdevel} = %{version}-%{release}
 Provides:	lib%{glname}-devel = %{version}-%{release}
 Provides:	%{glname}-devel = %{version}-%{release}
 Provides:	GL-devel
-Obsoletes:	%{oldlibglname}-devel < 6.4
-Provides:	%{oldlibglname}-devel = %{version}-%{release}
 Provides:	libMesaGL-devel = %{version}-%{release}
 Provides:	MesaGL-devel = %{version}-%{release}
 Provides:	libgl-devel
@@ -243,11 +239,17 @@
 Summary:	Development files for Mesa (EGL libs)
 Group:		Development/C
 Requires:	%{libeglname} = %{version}-%{release}
+Requires:	%{khrdevel} = %{version}-%{release}
 Provides:	EGL-devel
 Provides:	lib%{eglname}-devel
 Provides:	%{eglname}-devel
 Provides:	libegl-devel
 
+%package -n %{khrdevel}
+Summary:	Mesa Khronos development headers
+Group:		Development/C
+Provides:	mesakhr-devel = %{version}-%{release}
+
 %package -n %{libosmesaname}
 Summary:	Mesa offscreen rendering library
 Group:		System/Libraries
@@ -280,6 +282,7 @@
 Summary:	Development files for glesv1 libs
 Group:		Development/C
 Requires:	%{libglesv1name} = %{version}-%{release}
+Requires:	%{khrdevel} = %{version}-%{release}
 Provides:	lib%{glesv1name}-devel
 Provides:	%{glesv1name}-devel
 Provides:	libglesv1-devel
@@ -293,7 +296,7 @@
 Summary:	Development files for glesv2 libs
 Group:		Development/C
 Requires:	%{libglesv2name} = %{version}-%{release}
-Requires:	%{libeglname}-devel = %{version}-%{release}
+Requires:	%{khrdevel} = %{version}-%{release}
 Provides:	lib%{glesv2name}-devel
 Provides:	%{glesv2name}-devel
 Provides:	libglesv2-devel
@@ -426,6 +429,9 @@
 
 This package provides the OpenGL ES library version 1.
 
+%description -n %{khrdevel}
+Mesa Khronos development headers.
+
 %description -n %{libosmesaname}
 Mesa offscreen rendering libraries for rendering OpenGL into
 application-allocated blocks of memory.
@@ -645,10 +651,12 @@
 
 %files -n %{libeglname}-devel
 %{_includedir}/EGL
-%{_includedir}/KHR
 %{_libdir}/libEGL.so
 %{_libdir}/pkgconfig/egl.pc
 
+%files -n %{khrdevel}
+%{_includedir}/KHR
+
 %files -n %{osmesadevel}
 %dir %{_includedir}/GL
 %{_includedir}/GL/osmesa.h