From 39726d4947c69adce7db5c8c2803403dc5ec6e3755c50fe3f51131062cbd352d Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 23 Feb 2022 17:47:50 +0000
Subject: [PATCH 1/2] - spec: fix dependencies for mini variants (follow-up)  
 systemd-mini-container is one of the sub-package that relies systemd-mini to 
  conflict with kiwi and to not be installed on real systems.

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

diff --git a/systemd.changes b/systemd.changes
index 36c1c1b1..ebf015fd 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 23 17:46:12 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- spec: fix dependencies for mini variants (follow-up)
+
+  systemd-mini-container is one of the sub-package that relies systemd-mini to
+  conflict with kiwi and to not be installed on real systems.
+
 -------------------------------------------------------------------
 Tue Feb 22 15:22:16 UTC 2022 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 67bc1268..9c35df6d 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -388,10 +388,8 @@ Provides:       nss-mymachines = %{version}-%{release}
 Provides:       systemd-container = %{version}-%{release}
 Provides:       systemd:%{_bindir}/systemd-nspawn
 %if 0%{?bootstrap}
-Conflicts:      kiwi
 Conflicts:      systemd-container
 Provides:       systemd-container = %{version}-%{release}
-Requires:       this-is-only-for-build-envs
 %endif
 
 %description container

From db5aaafc0e1d2b9bf2afadc5f69e4b07285bc9e6bf7f50687b8523344ce44807 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 24 Feb 2022 13:44:24 +0000
Subject: [PATCH 2/2] - Fix a regression caused by the split of the sysusers
 config files shipped by   systemd (bsc#1196322)   Calls to %sysusers_create
 were not updated accordingly.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1257
---
 systemd.changes | 8 ++++++++
 systemd.spec    | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/systemd.changes b/systemd.changes
index ebf015fd..eb4b4324 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 24 13:23:35 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- Fix a regression caused by the split of the sysusers config files shipped by
+  systemd (bsc#1196322)
+
+  Calls to %sysusers_create were not updated accordingly.
+
 -------------------------------------------------------------------
 Wed Feb 23 17:46:12 UTC 2022 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 9c35df6d..31ea93ca 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -949,7 +949,9 @@ pam-config --add --systemd || :
 # systemd-sysusers is not available in %pre so this needs to be done
 # in %%post. However this shouldn't be an issue since all files the
 # main package ships are owned by root.
-%sysusers_create systemd.conf
+%sysusers_create systemd-journal.conf
+%sysusers_create systemd-network.conf
+%sysusers_create systemd-timesync.conf
 
 [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
 /usr/lib/systemd/systemd-random-seed save || :
@@ -1169,6 +1171,7 @@ fi
 %endif
 %if %{with resolved}
 %ldconfig
+%sysusers_create systemd-resolve.conf
 %service_add_post systemd-resolved.service
 %endif