From 5305ff9a1f5bd932dbb208b2c9f664209d7bc6f87876c215eecb9d96890d6da9 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 22 Nov 2017 14:47:28 +0000 Subject: [PATCH] - Restore previous changes OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=23 --- macros.systemd | 2 +- systemd-rpm-macros.changes | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/macros.systemd b/macros.systemd index df7f472..5ffc38a 100644 --- a/macros.systemd +++ b/macros.systemd @@ -246,7 +246,7 @@ fi \ %{nil} %tmpfiles_create() \ -[ -x /usr/bin/systemd-tmpfiles ] && \ +[ -z "${TRANSACTIONAL_UPDATE}" -a -x /usr/bin/systemd-tmpfiles ] && \ /usr/bin/systemd-tmpfiles --create %{?*} || : \ %{nil} diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index a05a42e..e627a41 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,11 +1,13 @@ +------------------------------------------------------------------- +Wed Nov 22 14:41:00 UTC 2017 - fbui@suse.com + +- Restore previous changes + ------------------------------------------------------------------- Fri Nov 17 09:23:14 UTC 2017 - fbui@suse.com - Revert previous changes - Dirk Mueller please don't accept changes while we're discussing - about them... - Also added reasons why the previous changes would be needed. -------------------------------------------------------------------