From 4fbeb5cf6203d97716c640635f4cf398139c1174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 21 Mar 2021 11:19:16 +0100 Subject: [PATCH] Do not pull in systemd during build %_systemd_util_dir was added to macros for exactly this purpose. --- rust-zram-generator.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rust-zram-generator.spec b/rust-zram-generator.spec index fd76c8d..8f34ce6 100644 --- a/rust-zram-generator.spec +++ b/rust-zram-generator.spec @@ -97,17 +97,16 @@ cp -a %{S:1} . %cargo_generate_buildrequires echo '/usr/bin/make' echo '/usr/bin/ronn' -echo 'pkgconfig(systemd)' echo 'systemd-rpm-macros' %build -export SYSTEMD_UTIL_DIR=$(pkg-config --variable=systemdutildir systemd) +export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} %cargo_build make systemd_service LC_ALL=C.UTF-8 ronn --roff --organization="zram-generator %{version_no_tilde}" man/*.md %install -export SYSTEMD_UTIL_DIR=$(pkg-config --variable=systemdutildir systemd) +export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} %cargo_install mkdir -p %{buildroot}%{_systemdgeneratordir} @@ -119,7 +118,7 @@ install -Dpm0644 -t %{buildroot}%{_mandir}/man5 man/zram-generator.conf.5 %if %{with check} %check -export SYSTEMD_UTIL_DIR=$(pkg-config --variable=systemdutildir systemd) +export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} %cargo_test %endif