From e2d727cc37fdbac9a3a6696b05f8af7fe4d2a22fde46269fa168730a1a0198b8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 21 Nov 2018 17:50:38 +0000 Subject: [PATCH 1/3] 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 | 2 +- wayland.changes | 7 +++++++ wayland.spec | 24 +++++++++++++++++++----- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 631aaa9..d391f78 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -6,5 +6,5 @@ wayland-devel requires -wayland- requires "libwayland-client0- = " requires "libwayland-cursor0- = " - requires "libwayland-egl1- = " + requires "libwayland-egl1- = " requires "libwayland-server0- = " diff --git a/wayland.changes b/wayland.changes index 606abca..ee3e030 100644 --- a/wayland.changes +++ b/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 diff --git a/wayland.spec b/wayland.spec index 43fbab5..16f9a60 100644 --- a/wayland.spec +++ b/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-cursor0 = %version -Requires: libwayland-egl1 = %version -Requires: libwayland-server0 = %version +Requires: libwayland-client0 = %_version +Requires: libwayland-cursor0 = %_version +Requires: libwayland-egl1 = %{eglversion} +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}/' "%{_sourcedir}/baselibs.conf" %build if [ ! -e configure ]; then From 018b8881fb33d87e438471aeecabb7f56e99fce48d9554676d19f38a32595063 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 21 Nov 2018 17:58:49 +0000 Subject: [PATCH 2/3] Rework changelog; rework double Requires for different versions. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=89 --- wayland.changes | 8 +++++--- wayland.spec | 21 ++++++--------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/wayland.changes b/wayland.changes index ee3e030..279ba79 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,9 +1,11 @@ ------------------------------------------------------------------- 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) +- Downgrades do not work in SLES service packs, because the SP0 + repo remains enabled for SP1. (This is unlike Leap, where a 15.1 + system will have no 15.0 directories.) As such, to force the + upgrade from Mesa:libwayland-egl1 to wayland:libwayland-egl1, + the number in wayland is bumped to >18. ------------------------------------------------------------------- Mon Nov 19 17:12:57 UTC 2018 - sndirsch@suse.com diff --git a/wayland.spec b/wayland.spec index 16f9a60..da40e6e 100644 --- a/wayland.spec +++ b/wayland.spec @@ -16,19 +16,12 @@ # %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 +# Set this to back to _version for SLEap 16. +%define eglversion 99~%_version %define lname libwayland0 Name: wayland -Version: %{_version} +Version: %_version Release: 0 Summary: Wayland Compositor Infrastructure License: MIT @@ -92,7 +85,7 @@ to get buffer for each cursor image. %package -n libwayland-egl1 Summary: Additional egl functions for wayland Group: System/Libraries -Version: %{eglversion} +Version: %eglversion %description -n libwayland-egl1 This package provides additional functions for EGL-using programs @@ -116,8 +109,7 @@ Summary: Development files for the Wayland Compositor Infrastructure Group: Development/Libraries/C and C++ Requires: libwayland-client0 = %_version Requires: libwayland-cursor0 = %_version -Requires: libwayland-egl1 = %{eglversion} -Requires: libwayland-egl1 = %_version +Requires: libwayland-egl1 = %eglversion Requires: libwayland-server0 = %_version %if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1550 @@ -150,8 +142,7 @@ This subpackage contains the documentation to Wayland. %prep %setup -q -# ugly, I know :-( -sed -i 's//%{eglversion}/' "%{_sourcedir}/baselibs.conf" +sed -i 's//%eglversion/' "%_sourcedir/baselibs.conf" %build if [ ! -e configure ]; then From 1f11eb7e94b742fa9d5d7870edfca23d3793af662e51d1ed980ce2fc4b1152fd Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 26 Nov 2018 10:16:34 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=90 --- wayland.changes | 2 +- wayland.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wayland.changes b/wayland.changes index 279ba79..079ab52 100644 --- a/wayland.changes +++ b/wayland.changes @@ -5,7 +5,7 @@ Tue Nov 20 12:57:23 UTC 2018 - sndirsch@suse.com repo remains enabled for SP1. (This is unlike Leap, where a 15.1 system will have no 15.0 directories.) As such, to force the upgrade from Mesa:libwayland-egl1 to wayland:libwayland-egl1, - the number in wayland is bumped to >18. + the number in wayland is bumped to >18 for those distros. ------------------------------------------------------------------- Mon Nov 19 17:12:57 UTC 2018 - sndirsch@suse.com diff --git a/wayland.spec b/wayland.spec index da40e6e..cb9fd10 100644 --- a/wayland.spec +++ b/wayland.spec @@ -16,8 +16,11 @@ # %define _version 1.16.0 -# Set this to back to _version for SLEap 16. +%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1550 %define eglversion 99~%_version +%else +%define eglversion %_version +%endif %define lname libwayland0 Name: wayland