diff --git a/baselibs.conf b/baselibs.conf index d391f78..af96cb3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -8,3 +8,5 @@ wayland-devel requires "libwayland-cursor0- = " requires "libwayland-egl1- = " requires "libwayland-server0- = " + provides "libwayland-egl-devel- = 18.1.5" + obsoletes "libwayland-egl-devel- < 18.1.5" 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 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