From 8fb9c1f4d944fcb28d0f5f4754d35f4fbda06e5f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sat, 5 Nov 2022 08:13:42 +0000
Subject: [PATCH] import wayland-1.21.0-1.el8

---
 .gitignore         |  2 +-
 .wayland.metadata  |  2 +-
 SPECS/wayland.spec | 21 +++++++++------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ae4681..52f12fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/wayland-1.19.0.tar.xz
+SOURCES/wayland-1.21.0.tar.xz
diff --git a/.wayland.metadata b/.wayland.metadata
index 15bca52..95fcb5b 100644
--- a/.wayland.metadata
+++ b/.wayland.metadata
@@ -1 +1 @@
-9ae0a89cfe6798250b19c72a987bda734d269060 SOURCES/wayland-1.19.0.tar.xz
+59f381d656e09f34135b7222fbf57e05ae7262e6 SOURCES/wayland-1.21.0.tar.xz
diff --git a/SPECS/wayland.spec b/SPECS/wayland.spec
index d04d353..458fb55 100644
--- a/SPECS/wayland.spec
+++ b/SPECS/wayland.spec
@@ -1,5 +1,5 @@
 Name:           wayland
-Version:        1.19.0
+Version:        1.21.0
 Release:        1%{?dist}
 Summary:        Wayland Compositor Infrastructure
 
@@ -14,6 +14,7 @@ BuildRequires:  expat-devel
 BuildRequires:  graphviz
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt
+BuildRequires:  meson
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  xmlto
 
@@ -82,21 +83,14 @@ Wayland server library
 %autosetup -p1
 
 %build
-%configure --disable-static --enable-documentation
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 %install
-%make_install
-
-find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
-
-# Remove lib64 rpaths
-chrpath -d $RPM_BUILD_ROOT%{_libdir}/libwayland-cursor.so
+%meson_install
 
 %check
-mkdir -m 700 tests/run
-XDG_RUNTIME_DIR=$PWD/tests/run make check || \
-{ rc=$?; cat test-suite.log; exit $rc; }
+%meson_test
 
 %files devel
 %{_bindir}/wayland-scanner
@@ -131,6 +125,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \
 %{_libdir}/libwayland-server.so.0*
 
 %changelog
+* Tue Oct 25 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.21.0-1
+- wayland 1.21.0 (rhbz#2137625)
+
 * Fri May 21 2021 Dave Airlie <airlied@redhat.com> - 1.19.0-1
 - wayland 1.19.0