From bf15b6e6e6cbe074e3e647cad3f7800947ffa1660e0f7dee79c8316bf856b396 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 21 Jun 2023 12:38:22 +0000
Subject: [PATCH] when the tmpfiles are run at package installation time.
 Theoretically with   only "Requires(pre): group()", rpm is allowed to drop
 the group at the end of   the package installations hence let's keep
 "Requires: group()" dep.   Note: this is also needed when (post)file-triggers
 are enabled due to the   current limitation of the default libzypp
 transaction backend.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1402
---
 systemd.changes |  8 ++++++--
 systemd.spec    | 13 +++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/systemd.changes b/systemd.changes
index 610c1964..23682c86 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -2,8 +2,12 @@
 Wed Jun 21 10:30:58 UTC 2023 - Franck Bui <fbui@suse.com>
 
 - Make sure to pre-install the groups systemd and udev rely on. This is needed
-  when the tmpfiles are run at package installation time (i.e. when
-  file-triggers are disabled).
+  when the tmpfiles are run at package installation time. Theoretically with
+  only "Requires(pre): group()", rpm is allowed to drop the group at the end of
+  the package installations hence let's keep "Requires: group()" dep.
+
+  Note: this is also needed when (post)file-triggers are enabled due to the
+  current limitation of the default libzypp transaction backend.
 
 -------------------------------------------------------------------
 Wed Jun 21 09:28:29 UTC 2023 - Franck Bui <fbui@suse.com>
diff --git a/systemd.spec b/systemd.spec
index e5e52419..7aeb2d5f 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -137,15 +137,17 @@ Requires:       netcfg >= 11.5
 Requires:       systemd-default-settings-branding
 Requires:       systemd-presets-branding
 Requires:       util-linux >= 2.27.1
+Requires:       group(lock)
+# The next dependency is also needed with file-triggers enabled due to the way
+# the libzypp default transaction backend works.
 Requires(pre):  group(lock)
-# This Recommends because some symbols of libpcre2 are dlopen()ed by journalctl
-Recommends:     libpcre2-8-0
-Recommends:     libbpf0
-
 Requires(post): coreutils
 Requires(post): findutils
 Requires(post): systemd-presets-branding
 Requires(post): pam-config >= 0.79-5
+# This Recommends because some symbols of libpcre2 are dlopen()ed by journalctl
+Recommends:     libpcre2-8-0
+Recommends:     libbpf0
 %endif
 Conflicts:      filesystem < 11.5
 Conflicts:      mkinitrd < 2.7.0
@@ -323,6 +325,9 @@ Requires:       %{name} = %{version}-%{release}
 Requires:       filesystem
 Requires:       kmod
 Requires:       system-group-hardware
+Requires:       group(kvm)
+# The next dependency is also needed with file-triggers enabled due to the way
+# the libzypp default transaction backend works.
 Requires(pre):  group(kvm)
 Requires(post): sed
 Requires(post): coreutils