[packages/systemd] use new meson macros

atler atler at pld-linux.org
Thu Mar 6 17:02:03 CET 2025


commit 96456f5cf937719a840a72e6a963e81a34d4634c
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Mar 6 16:19:44 2025 +0100

    use new meson macros

 systemd.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index c82305f..f9d2970 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -149,7 +149,7 @@ BuildRequires:	python3-jinja2
 BuildRequires:	python3-lxml
 %{?with_qrencode:BuildRequires:	qrencode-devel >= 3}
 BuildRequires:	rpm-build >= 4.6
-BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	rpmbuild(macros) >= 2.042
 BuildRequires:	sed >= 4.0
 %{?with_tests:BuildRequires:	systemd}
 %{?with_tpm2:BuildRequires:	tpm2-tss-devel >= 3.0.0}
@@ -838,7 +838,7 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
 	src/kernel-install/60-ukify.install.in
 
 %build
-%meson build \
+%meson \
 	-Dadm-gid=3 \
 	-Daudio-gid=23 \
 	-Dcdrom-gid=27 \
@@ -901,11 +901,11 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
 	-Dumount-path=/bin/umount \
 	-Dxenctrl=%{__true_false xen}
 
-%ninja_build -C build
+%meson_build
 
 %{__cc} %{rpmcppflags} %{rpmcflags} -o build/systemd_booted %{rpmldflags} src/systemd_booted.c -Lbuild -lsystemd
 
-%{?with_tests:%ninja_test -C build}
+%{?with_tests:%meson_test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -917,7 +917,7 @@ install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \
 	$RPM_BUILD_ROOT%{systemdunitdir}/systemd-udevd.service.d \
 	$RPM_BUILD_ROOT%{_prefix}/lib/{repart.d,systemd/system-environment-generators,sysupdate.d}
 
-%ninja_install -C build
+%meson_install
 
 touch $RPM_BUILD_ROOT/var/lib/%{name}/random-seed
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/6839c8d4bba4b41ea818eab1bc5cd948f88910f0



More information about the pld-cvs-commit mailing list