From e181ced3f7f8d5de5db4fc3dc110546a204bac4a Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 23 Jan 2019 11:56:24 +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#1668688 Related-Bug: #1804822 Signed-off-by: Bogdan Dobrelya --- rsyslog.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index 1288c8a..f1ebad1 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -9,7 +9,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.39.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -39,9 +39,7 @@ BuildRequires: qpid-proton-c-devel Requires: logrotate >= 3.5.2 Requires: bash >= 2.0 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_ordering} Provides: syslog Obsoletes: sysklogd < 1.5-11 @@ -503,6 +501,9 @@ done %doc %{rsyslog_docdir}/k8s_container_name.rulebase %changelog +* Wed Jan 23 2019 Bogdan Dobrelya - 8.39.0-2 +- Use systemd_ordering macro + * Wed Dec 05 2018 Jiri Vymazal - 8.39.0-1 - rebase to upstream version 8.39.0 resolves: rhbz#1649081