[packages/libinput] - updated meson version and macros

qboosh qboosh at pld-linux.org
Sat Aug 15 21:58:50 CEST 2020


commit 2ea47e4fe62dcfeb75a316406b357500a13ab662
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Aug 15 22:01:05 2020 +0200

    - updated meson version and macros

 libinput.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/libinput.spec b/libinput.spec
index f5e191c..1be97a0 100644
--- a/libinput.spec
+++ b/libinput.spec
@@ -24,11 +24,11 @@ BuildRequires:	check-devel >= 0.9.10
 BuildRequires:	libevdev-devel >= 1.3
 %{?with_libunwind:BuildRequires:	libunwind-devel}
 BuildRequires:	libwacom-devel >= 0.20
-BuildRequires:	meson >= 0.41.0
+BuildRequires:	meson >= 0.45.0
 BuildRequires:	mtdev-devel >= 1.1.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.728
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	udev-devel
 BuildRequires:	valgrind
 %if %{with gui}
@@ -111,7 +111,7 @@ Statyczna biblioteka libinput.
 Summary:	API documentation for libinput library
 Summary(pl.UTF-8):	Dokumentacja API biblioteki libinput
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
 %endif
 
@@ -147,14 +147,15 @@ Dopełnianie parametrów w zsh dla polecenia libinput.
 	-Ddocumentation=%{__true_false doc} \
 	-Dudev-dir=/lib/udev \
 	-Dzshcompletiondir=%{zsh_compdir}
-%meson_build -C build
 
-%{?with_tests:%meson_test -C build}
+%ninja_build -C build
+
+%{?with_tests:%ninja_test -C build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/libinput-test-suite.1
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libinput.git/commitdiff/2ea47e4fe62dcfeb75a316406b357500a13ab662



More information about the pld-cvs-commit mailing list