From dcd5dbe649013b15beee85bbe4e012c7e888c43a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Jan 2021 08:17:30 +0100 Subject: [PATCH] Switch to meson build system --- wayland.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/wayland.spec b/wayland.spec index 42e6997..71944f0 100644 --- a/wayland.spec +++ b/wayland.spec @@ -7,15 +7,15 @@ License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz -BuildRequires: make BuildRequires: gcc -BuildRequires: chrpath +BuildRequires: gcc-c++ BuildRequires: docbook-style-xsl BuildRequires: doxygen BuildRequires: expat-devel BuildRequires: graphviz BuildRequires: libxml2-devel BuildRequires: libxslt +BuildRequires: meson BuildRequires: pkgconfig(libffi) BuildRequires: xmlto @@ -73,21 +73,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 @@ -102,7 +95,7 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_mandir}/man3/*.3* %files doc -%doc README TODO +%doc README %{_datadir}/doc/wayland/ %files -n libwayland-client @@ -124,6 +117,7 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %changelog * Thu Jan 28 2021 Kalev Lember - 1.19.0-1 - Update to 1.19.0 +- Switch to meson build system * Wed Jan 27 2021 Fedora Release Engineering - 1.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild