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