pool/systemd-rpm-macros
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- %sysusers_create_inline was wrongly marked as deprecated

Browse Source 
- %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
This commit is contained in:
Franck Bui 2022-01-18 21:06:57 +00:00 committed by Git OBS Bridge
parent 6f387afc22
commit 7e598848c4
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
macros.systemd
View File

@ -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 - <<SYSTEMD_INLINE_EOF || : \
%{?*} \
SYSTEMD_INLINE_EOF\

8
systemd-rpm-macros.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jan 18 07:57:14 UTC 2022 - Franck Bui <fbui@suse.com>
- %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 <fbui@suse.com>

2
systemd-rpm-macros.spec
View File

@ -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