From f0c8ea9afc7331a54603b17ad912921f45cbc06447c6caca75c1ab0400639eea Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 20 May 2021 09:47:35 +0000
Subject: [PATCH 1/3] - %sysusers_create_inline: use here-docs instead of echo
 (bsc#1186282)   Upstream commit dd2490ae12ad1e1795ecbf8f8944b950da9c8d06.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=66
---
 macros.systemd             | 6 +++---
 systemd-rpm-macros.changes | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/macros.systemd b/macros.systemd
index 7a4bfb9..d9e02a2 100644
--- a/macros.systemd
+++ b/macros.systemd
@@ -226,9 +226,9 @@ fi											\
 %{nil}
 
 %sysusers_create_inline() \
-if [ -x /usr/bin/systemd-sysusers ]; then \
-	echo %{?*} | systemd-sysusers - || : \
-fi \
+[ -x /usr/bin/systemd-sysusers ] && /usr/bin/systemd-sysusers - <<SYSTEMD_INLINE_EOF || : \
+%{?*} \
+SYSTEMD_INLINE_EOF\
 %{nil}
 
 %sysctl_apply() \
diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes
index a4fb85c..bab9422 100644
--- a/systemd-rpm-macros.changes
+++ b/systemd-rpm-macros.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 20 09:45:11 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- %sysusers_create_inline: use here-docs instead of echo (bsc#1186282)
+
+  Upstream commit dd2490ae12ad1e1795ecbf8f8944b950da9c8d06.
+
 -------------------------------------------------------------------
 Fri Mar  5 12:27:14 UTC 2021 - Franck Bui <fbui@suse.com>
 

From 37d00203df71ea1246a766a939b7543c1e9683ca6454b6a0645e9993dec91452 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 20 May 2021 10:17:34 +0000
Subject: [PATCH 2/3] - Introduce %sysusers_create_package   %sysusers_create
 and %sysusers_create_inline are now deprecated and   the new macro should be
 used instead.   Upstream commit 07a7d4a0040d221ff09e527e91c112b4ffab1dba. -
 Introduce %tmpfiles_create_package   %%tmpfiles_create is now deprecreated
 and the new macros should be   used instead.   Upstream commit
 0f78fee8d039000b987848a558fbaa15d916e14e.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=67
---
 macros.systemd             | 47 ++++++++++++++++++++++++++++++++++++++
 systemd-rpm-macros.changes | 17 ++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/macros.systemd b/macros.systemd
index d9e02a2..1bccfc1 100644
--- a/macros.systemd
+++ b/macros.systemd
@@ -216,21 +216,68 @@ fi											\
 [ -x /usr/bin/journalctl ] && /usr/bin/journalctl --update-catalog || : \
 %{nil}
 
+# Deprecated. Use %tmpfiles_create_package instead
 %tmpfiles_create() \
 [ -z "${TRANSACTIONAL_UPDATE}" -a -x /usr/bin/systemd-tmpfiles ] && \
 	/usr/bin/systemd-tmpfiles --create %{?*} || : \
 %{nil}
 
+# This may be used by package installation scripts to create files according to
+# their tmpfiles configuration from a package installation script, even before
+# the files of that package are installed on disk.
+#
+# Example:
+#   Source1: %{name}-tmpfiles.conf
+#   ...
+#   %install
+#   install -D %SOURCE1 %{buildroot}%{_tmpfilesdir}/%{name}.conf
+#   %pre
+#   %tmpfiles_create_package %{name} %SOURCE1
+#   %files
+#   %{_tmpfilesdir}/%{name}.conf
+#
+%tmpfiles_create_package() \
+if [ -z "${TRANSACTIONAL_UPDATE}" ]; then \
+	/usr/bin/systemd-tmpfiles --replace=%_tmpfilesdir/%1.conf --create - <<SYSTEMD_INLINE_EOF || : \
+%(cat %2) \
+SYSTEMD_INLINE_EOF\
+%fi \
+%{nil}
+
+# Deprecated. Use %sysusers_create_package instead
 %sysusers_create() \
+%{warn: %%sysusers_create is deprecated, use %%sysusers_create_package instead} \
 [ -x /usr/bin/systemd-sysusers ] && /usr/bin/systemd-sysusers %{?*} || : \
 %{nil}
 
+# Deprecated. Use %sysusers_create_package instead
 %sysusers_create_inline() \
+%{warn: %%sysusers_create_inline is deprecated, use %%sysusers_create_package instead} \
 [ -x /usr/bin/systemd-sysusers ] && /usr/bin/systemd-sysusers - <<SYSTEMD_INLINE_EOF || : \
 %{?*} \
 SYSTEMD_INLINE_EOF\
 %{nil}
 
+# This should be used by package installation scripts which require users or
+# groups to be present before the files installed by the package are present on
+# disk (for example because some files are owned by those users or groups).
+#
+# Example:
+#   Source1: %{name}-sysusers.conf
+#   ...                      
+#   %install                 
+#   install -D %SOURCE1 %{buildroot}%{_sysusersdir}/%{name}.conf
+#   %pre
+#   %sysusers_create_package %{name} %SOURCE1
+#   %files
+#   %{_sysusersdir}/%{name}.conf
+#
+%sysusers_create_package() \
+/usr/bin/systemd-sysusers --replace=%_sysusersdir/%1.conf - <<SYSTEMD_INLINE_EOF || : \
+%(cat %2) \
+SYSTEMD_INLINE_EOF\
+%{nil}
+
 %sysctl_apply() \
 [ -x /usr/lib/systemd/systemd-sysctl ] && \
 	/usr/lib/systemd/systemd-sysctl %{?*} || : \
diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes
index bab9422..133b68d 100644
--- a/systemd-rpm-macros.changes
+++ b/systemd-rpm-macros.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu May 20 09:54:00 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Introduce %sysusers_create_package
+
+  %sysusers_create and %sysusers_create_inline are now deprecated and
+  the new macro should be used instead.
+
+  Upstream commit 07a7d4a0040d221ff09e527e91c112b4ffab1dba.
+
+- Introduce %tmpfiles_create_package
+
+  %%tmpfiles_create is now deprecreated and the new macros should be
+  used instead.
+
+  Upstream commit 0f78fee8d039000b987848a558fbaa15d916e14e.
+
 -------------------------------------------------------------------
 Thu May 20 09:45:11 UTC 2021 - Franck Bui <fbui@suse.com>
 

From bbc4a5b7940e0cf03b9a0df92a64e834c5200ce611647b28f2bead2093d17f10 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 20 May 2021 10:18:45 +0000
Subject: [PATCH 3/3] - Bump to version 12

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

diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes
index 133b68d..bf6c661 100644
--- a/systemd-rpm-macros.changes
+++ b/systemd-rpm-macros.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 20 10:18:23 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Bump to version 12
+
 -------------------------------------------------------------------
 Thu May 20 09:54:00 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-rpm-macros.spec b/systemd-rpm-macros.spec
index 13f3195..8dd8b31 100644
--- a/systemd-rpm-macros.spec
+++ b/systemd-rpm-macros.spec
@@ -17,7 +17,7 @@
 
 
 Name:           systemd-rpm-macros
-Version:        11
+Version:        12
 Release:        0
 Summary:        RPM macros for systemd
 License:        LGPL-2.1-or-later