From 7f595853d6d8081f9b4399212f697ae435499168 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Tue, 22 Jan 2019 16:13:30 +0100 Subject: [PATCH] Optimize systemd dependency for containers According to https://fedoraproject.org/wiki/Packaging:Scriptlets: If a package is suitable for installation without systemd (in a container image, for example) and does not require any of the systemd mechanisms such as tmpfiles.d, then the systemd_ordering macro MAY be used instead of the systemd_requires macro. That is exactly the case we want to address for container images when installing packages in it. Resolves: rhbz#1654672 Related-Bug: #1804822 Signed-off-by: Bogdan Dobrelya (cherry picked from commit e07ed63d656e9d3f6688eea695b1ef8e08028993) --- puppet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 2be5ccb..87e0556 100644 --- a/puppet.spec +++ b/puppet.spec @@ -98,7 +98,7 @@ Provides: hiera-puppet = %{version}-%{release} Requires(pre): shadow-utils %if 0%{?_with_systemd} -%{?systemd_requires} +%{?systemd_ordering} BuildRequires: systemd %else Requires(post): chkconfig @@ -120,7 +120,7 @@ Group: System Environment/Base Summary: Server for the puppet system management tool Requires: puppet = %{version}-%{release} %if 0%{?_with_systemd} -%{?systemd_requires} +%{?systemd_ordering} BuildRequires: systemd %else Requires(post): chkconfig