From ccdbdfce8dee688b25b7006f14b02821a110f1b7717580248aeb9a16ce4d48b8 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 18 Jan 2022 21:06:57 +0000 Subject: [PATCH 1/2] - %sysusers_create_inline was wrongly marked as deprecated - %sysusers_create can be useful in certain cases and won't go away until we'll move to file triggers. So don't mark it as deprecated too OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=74 --- macros.systemd | 18 ++++++++++++++---- systemd-rpm-macros.changes | 8 ++++++++ systemd-rpm-macros.spec | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/macros.systemd b/macros.systemd index 6cc72d1..176fc3c 100644 --- a/macros.systemd +++ b/macros.systemd @@ -250,15 +250,25 @@ SYSTEMD_INLINE_EOF\ %fi \ %{nil} -# Deprecated. Use %sysusers_create_package instead +# This should be used by package installation scripts which doesn't require +# users or groups to be present before the files installed by the package are +# present on disk and when the sysusers conf files are generated during the +# build of the package hence not easily available before the build of the +# package. +# +# This macro will go away when this will be moved to file triggers. +# +# Example: +# %post +# %sysusers_create %{name}.conf +# %files +# %{_sysusersdir}/%{name}.conf +# %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 - < + +- %sysusers_create_inline was wrongly marked as deprecated + +- %sysusers_create can be useful in certain cases and won't go away until we'll + move to file triggers. So don't mark it as deprecated too + ------------------------------------------------------------------- Wed Nov 17 12:28:16 UTC 2021 - Franck Bui diff --git a/systemd-rpm-macros.spec b/systemd-rpm-macros.spec index 7e0b9ed..bb7a2ec 100644 --- a/systemd-rpm-macros.spec +++ b/systemd-rpm-macros.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-rpm-macros # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From ccdcf965abb2bc3f698de29375f1941a346dcb8ce5173dde6406ae3a7cde5a68 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 19 Jan 2022 08:27:38 +0000 Subject: [PATCH 2/2] - Bump to version 15 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=75 --- 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 d20cc84..d974674 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 19 08:28:16 UTC 2022 - Franck Bui + +- Bump to version 15 + ------------------------------------------------------------------- Tue Jan 18 07:57:14 UTC 2022 - Franck Bui diff --git a/systemd-rpm-macros.spec b/systemd-rpm-macros.spec index bb7a2ec..e1ccd3c 100644 --- a/systemd-rpm-macros.spec +++ b/systemd-rpm-macros.spec @@ -17,7 +17,7 @@ Name: systemd-rpm-macros -Version: 14 +Version: 15 Release: 0 Summary: RPM macros for systemd License: LGPL-2.1-or-later