From d4018cfe5a08f466468127863ba696dcbff378f82ce111c84298ded670c91cb5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 5 Mar 2022 15:18:59 +0000
Subject: [PATCH] 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-<targettype> = <version>"
 	requires "libwayland-egl1-<targettype> = <eglversion>"
 	requires "libwayland-server0-<targettype> = <version>"
+    conflicts "libwayland-egl-devel-<targettype> <= 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 <sndirsch@suse.com>
+
+- 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 <alynx.zhou@suse.com>