From d4018cfe5a08f466468127863ba696dcbff378f82ce111c84298ded670c91cb5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 5 Mar 2022 15:18:59 +0000 Subject: [PATCH 1/2] Accepting request 956896 from home:yfjiang:branches:X11:Wayland sync configuration with sle/leap. OBS-URL: https://build.opensuse.org/request/show/956896 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=100 --- baselibs.conf | 1 + wayland.changes | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index d391f78..b5d9000 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -8,3 +8,4 @@ wayland-devel requires "libwayland-cursor0- = " requires "libwayland-egl1- = " requires "libwayland-server0- = " + conflicts "libwayland-egl-devel- <= 18.0.2" diff --git a/wayland.changes b/wayland.changes index ba0b0c1..a8f885d 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 25 15:37:00 UTC 2022 - Stefan Dirsch + +- There is a file conflict in current wayland-devel-32bit and + prvevious libwayland-egl-devel-32bit package; therefore add + a conflicts to baselibs.conf + ------------------------------------------------------------------- Tue Jan 11 08:29:19 UTC 2022 - Alynx Zhou From d4b1a8a230f77648924deb4e0d434d54fa2ef9f2e9b6e7b7375b846da56bff30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 5 Mar 2022 15:22:04 +0000 Subject: [PATCH 2/2] make baslibs confl/prov/obsol the same as regular package OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=101 --- baselibs.conf | 3 ++- wayland.spec | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index b5d9000..af96cb3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -8,4 +8,5 @@ wayland-devel requires "libwayland-cursor0- = " requires "libwayland-egl1- = " requires "libwayland-server0- = " - conflicts "libwayland-egl-devel- <= 18.0.2" + provides "libwayland-egl-devel- = 18.1.5" + obsoletes "libwayland-egl-devel- < 18.1.5" diff --git a/wayland.spec b/wayland.spec index 46e36a8..990fd96 100644 --- a/wayland.spec +++ b/wayland.spec @@ -116,6 +116,7 @@ Requires: libwayland-cursor0 = %_version Requires: libwayland-egl1 = %eglversion Requires: libwayland-server0 = %_version %if 0%{?suse_version} >= 1500 +# egl1 was once provided by Mesa 17.x. %if (0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400) Provides: libwayland-egl-devel = 18.1.5 Obsoletes: libwayland-egl-devel < 18.1.5