From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 15 Jan 2021 09:31:00 +0000 (+0100)
Subject: rpm: expose $systemd_util_dir also as rpm macro
X-Git-Tag: v248-rc1~335
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bc66bfa0136e370a8f7b06c3b69a52f5636ef82;p=thirdparty%2Fsystemd.git

rpm: expose $systemd_util_dir also as rpm macro

This variable (a.k.a. rootlibexecdir), was exposed through the .pc file, but
not as rpm macro.

The .pc file must be located in the package that provides libraries, which
pulls in a lot of dependencies. In Fedora, the macros are split out to a
separate package so that other packages which need to refer to some systemd
path but don't otherwise require it, can only pull in the (much smaller and
dependency-less) macros package. zram-generator uses the path to specify the
location of systemd-makefs, so by using the rpm macro we'll be able to use
a much smaller buildroot.
---

diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index 6988500f4c9..1c40328db0f 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -5,6 +5,7 @@
 
 # RPM macros for packages installing systemd unit files
 
+%_systemd_util_dir @rootlibexecdir@
 %_unitdir @systemunitdir@
 %_userunitdir @userunitdir@
 %_presetdir @systempresetdir@