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

Accepting request 894598 from Base:System

Browse Source 
- Bump to version 12

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

- %sysusers_create_inline: use here-docs instead of echo (bsc#1186282)
  Upstream commit dd2490ae12ad1e1795ecbf8f8944b950da9c8d06.

OBS-URL: https://build.opensuse.org/request/show/894598
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd-rpm-macros?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2021-05-23 21:30:19 +00:00 committed by Git OBS Bridge
commit a42dcffc95
3 changed files with 80 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
macros.systemd
View File

@ -216,19 +216,66 @@ 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() \
if [ -x /usr/bin/systemd-sysusers ]; then \
echo %{?*} | systemd-sysusers - || : \
fi \
%{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() \

29
systemd-rpm-macros.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
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>
- 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>
- %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>

2
systemd-rpm-macros.spec
View File

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