--- cauldron/mesa/current/SPECS/mesa.spec	2018/04/16 16:22:09	1219359
+++ cauldron/mesa/current/SPECS/mesa.spec	2018/04/16 19:34:30	1219406
@@ -1,5 +1,3 @@
-%bcond_without wayland
-
 # (cg) Cheater...
 %define Werror_cflags %nil
 
@@ -15,7 +13,7 @@
 # define version, RC & release
 %define main_version		18.0.0
 #define relc			5
-%define rel			7
+%define rel			8
 
 %define release			%mkrel %{?relc:0.rc%{relc}.}%{rel}
 
@@ -106,6 +104,9 @@
 %define platform_drivers ,i915,i965
 %define gallium_platform_drivers ,svga
 %endif
+
+%define with_wayland_egl 0
+
 %define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}
 
 Name:		mesa
@@ -145,11 +146,9 @@
 BuildRequires:  pkgconfig(libva)
 %endif
 BuildRequires:  pkgconfig(vdpau)
-%if %{with wayland}
 BuildRequires: pkgconfig(wayland-client)
 BuildRequires: pkgconfig(wayland-server)
 BuildRequires: pkgconfig(wayland-protocols)
-%endif
 %if %{enable_vulkan}
 BuildRequires:	libgcrypt-devel
 %endif
@@ -326,7 +325,7 @@
 Provides:	lib%{gbmname}-devel
 Provides:	%{gbmname}-devel
 
-%if %{with wayland}
+%if %{?with_wayland_egl}
 %package -n	%{libwaylandeglname}
 Summary:	Files for Mesa (Wayland EGL libs)
 Group:		System/Libraries
@@ -482,7 +481,7 @@
 Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.
 GBM (Graphics Buffer Manager) development parts.
 
-%if %{with wayland}
+%if %{?with_wayland_egl}
 %description -n	%{libwaylandeglname}
 Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.
 Wayland EGL platform parts.
@@ -549,7 +548,7 @@
 		--disable-xvmc \
 		--enable-vdpau \
 		%{?with_vaapi:--enable-va} \
-		--with-platforms=x11,drm,surfaceless%{?with_wayland:,wayland} \
+		--with-platforms=x11,drm,surfaceless,wayland \
 		--enable-shared-glapi \
 		--enable-gbm \
 		--enable-glx \
@@ -590,6 +589,12 @@
 # remove .la files
 find %{buildroot} -name '*.la' -delete
 
+# remove libwayland-egl on F28+ where it's built as part of wayland source package
+%if !%{?with_wayland_egl}
+rm -f %{buildroot}%{_libdir}/libwayland-egl.so*
+rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
+%endif
+
 #------------------------------------------------------------------------------
 
 %files
@@ -627,7 +632,7 @@
 %{_libdir}/libgbm.so.%{gbmmajor}
 %{_libdir}/libgbm.so.%{gbmmajor}.*
 
-%if %{with wayland}
+%if %{?with_wayland_egl}
 %files -n %{libwaylandeglname}
 %{_libdir}/libwayland-egl.so.%{waylandeglmajor}
 %{_libdir}/libwayland-egl.so.%{waylandeglmajor}.*
@@ -689,7 +694,7 @@
 %{_includedir}/gbm.h
 %{_libdir}/pkgconfig/gbm.pc
 
-%if %{with wayland}
+%if %{?with_wayland_egl}
 %files -n %{libwaylandeglname}-devel
 %{_libdir}/libwayland-egl.so
 %{_libdir}/pkgconfig/wayland-egl.pc