Accepting request 650610 from home:sndirsch:branches:X11:Wayland

- Set libwayland-egl1 version to 18.x.x_{%wayland_version} until
  wayland becomes bigger; needed due to Mesa providing this
  package in the past as version 18.0.2/18.1.5 (sle15/TW)

- now also use right version number of libwayland-egl1 in baselibs.conf

OBS-URL: https://build.opensuse.org/request/show/650610
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=88

baselibs.conf

@@ -6,5 +6,5 @@ wayland-devel
 	requires -wayland-<targettype>
 	requires "libwayland-client0-<targettype> = <version>"
 	requires "libwayland-cursor0-<targettype> = <version>"
-	requires "libwayland-egl1-<targettype> = <version>"
+	requires "libwayland-egl1-<targettype> = <eglversion>"
 	requires "libwayland-server0-<targettype> = <version>"

wayland.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 20 12:57:23 UTC 2018 - sndirsch@suse.com
+
+- Set libwayland-egl1 version to 18.x.x_{%wayland_version} until
+  wayland becomes bigger; needed due to Mesa providing this
+  package in the past as version 18.0.2/18.1.5 (sle15/TW)
+
 -------------------------------------------------------------------
 Mon Nov 19 17:12:57 UTC 2018 - sndirsch@suse.com
 

wayland.spec

@@ -15,10 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%define _version 1.16.0
+
+### Set this to _version (or do a specfile cleanup) once wayland becomes
+### bigger. Reason for this: In the past we've built the libwayland-egl1
+### package by Mesa (version 18.0.2/18.1.5)
+%if 0%{?suse_version} >= 1550
+%define eglversion 18.1.5_%{_version}
+%else
+%define eglversion 18.0.2_%{_version}
+%endif
 
 %define lname	libwayland0
 Name:           wayland
-Version:        1.16.0
+Version:        %{_version}
 Release:        0
 Summary:        Wayland Compositor Infrastructure
 License:        MIT
@@ -82,6 +92,7 @@ to get buffer for each cursor image.
 %package -n libwayland-egl1
 Summary:        Additional egl functions for wayland
 Group:          System/Libraries
+Version:        %{eglversion}
 
 %description -n libwayland-egl1
 This package provides additional functions for EGL-using programs
@@ -103,10 +114,11 @@ fullscreen) or other display servers.
 %package devel
 Summary:        Development files for the Wayland Compositor Infrastructure
 Group:          Development/Libraries/C and C++
-Requires:       libwayland-client0 = %version
+Requires:       libwayland-client0 = %_version
-Requires:       libwayland-cursor0 = %version
+Requires:       libwayland-cursor0 = %_version
-Requires:       libwayland-egl1 = %version
+Requires:       libwayland-egl1 = %{eglversion}
-Requires:       libwayland-server0 = %version
+Requires:       libwayland-egl1 = %_version
+Requires:       libwayland-server0 = %_version
 %if 0%{?suse_version} >= 1500
 %if 0%{?suse_version} >= 1550
 Provides:       libwayland-egl-devel = 18.1.5
@@ -138,6 +150,8 @@ This subpackage contains the documentation to Wayland.
 
 %prep
 %setup -q
+# ugly, I know :-(
+sed -i 's/<eglversion>/%{eglversion}/' "%{_sourcedir}/baselibs.conf"
 
 %build
 if [ ! -e configure ]; then