From 4ff2bb73dd5e1110c0d411f58d7d189f0bbdb6f5 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Mon, 11 Feb 2019 14:27:29 +0100
Subject: [PATCH] Revert "Optimize systemd dependency for containers"

It was generally a mistake to use `%systemd_ordering` in those
circumstances, as the tmpfiles stuff doesn't work and populate the
`/tmp` and `/run` directories. The reason why the packages install is
that all the commands in the macros have `|| :` at the end, so their
error state is ignored.

Something to re-consider for future attempts to fix/improve that:
If the tmpfiles and such were split out into a subpackage that'd be
required if and only if the kernel was installed or being installed,
that might work.

Related: rhbz#1654672
Related-Bug: #1804822
This reverts commit e07ed63d656e9d3f6688eea695b1ef8e08028993.
---
 puppet.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet.spec b/puppet.spec
index 7971bf9..83f01ff 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -103,7 +103,7 @@ Provides:       hiera-puppet = %{version}-%{release}
 
 Requires(pre):  shadow-utils
 %if 0%{?_with_systemd}
-%{?systemd_ordering}
+%{?systemd_requires}
 BuildRequires: systemd
 %else
 Requires(post): chkconfig
@@ -124,7 +124,7 @@ along with obviously discrete elements like packages, services, and files.
 Summary:        Server for the puppet system management tool
 Requires:       puppet = %{version}-%{release}
 %if 0%{?_with_systemd}
-%{?systemd_ordering}
+%{?systemd_requires}
 BuildRequires: systemd
 %else
 Requires(post): chkconfig