From 018b8881fb33d87e438471aeecabb7f56e99fce48d9554676d19f38a32595063 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 21 Nov 2018 17:58:49 +0000 Subject: [PATCH] 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