diff --git a/.gitignore b/.gitignore index 912d29c..5a29306 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /wayland-1.16.92.tar.xz /wayland-1.17.0.tar.xz /wayland-1.18.0.tar.xz +/wayland-1.19.0.tar.xz diff --git a/sources b/sources index e803fb3..7bbe46b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.18.0.tar.xz) = e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc +SHA512 (wayland-1.19.0.tar.xz) = d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef diff --git a/wayland.spec b/wayland.spec index 100d83b..9cac2e3 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.18.0 -Release: 2%{?dist} +Version: 1.19.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -8,13 +8,14 @@ URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz 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 @@ -31,12 +32,6 @@ Requires: libwayland-client%{?_isa} = %{version}-%{release} Requires: libwayland-cursor%{?_isa} = %{version}-%{release} Requires: libwayland-egl%{?_isa} = %{version}-%{release} Requires: libwayland-server%{?_isa} = %{version}-%{release} -# For upgrade path from F24 -Provides: libwayland-client-devel = %{version}-%{release} -Provides: libwayland-cursor-devel = %{version}-%{release} -Provides: libwayland-server-devel = %{version}-%{release} -# For upgrade path from F27 -Provides: libwayland-egl-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -72,21 +67,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 @@ -101,7 +89,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 @@ -121,6 +109,14 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Thu Jan 28 2021 Kalev Lember - 1.19.0-1 +- Update to 1.19.0 +- Switch to meson build system +- Drop old provides + +* Wed Jan 27 2021 Fedora Release Engineering - 1.18.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild