Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package systemd-rpm-macros for openSUSE:Factory checked in at 2021-03-11 20:06:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-rpm-macros" Thu Mar 11 20:06:48 2021 rev:34 rq:877267 version:11 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes 2021-02-17 18:09:47.581854850 +0100 +++ /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.2401/systemd-rpm-macros.changes 2021-03-11 20:06:52.188136751 +0100 @@ -1,0 +2,28 @@ +Fri Mar 5 12:27:14 UTC 2021 - Franck Bui <[email protected]> + +- Bump to version 11 + +------------------------------------------------------------------- +Fri Mar 5 11:10:16 UTC 2021 - Antonio Larrosa <[email protected]> + +- Don't pass -f to rm in %service_add_post nor %systemd_user_post + +------------------------------------------------------------------- +Fri Mar 5 11:03:49 UTC 2021 - Antonio Larrosa <[email protected]> + +- Add a %systemd_user_pre macro that creates a + /run/systemd/rpm/needs-user-preset/$service file for each new + service being installed so %systemd_user_post can call + `systemctl --global preset $service` properly for newly + installed user services (boo#1183051, boo#1183012). + +------------------------------------------------------------------- +Thu Mar 4 13:11:15 UTC 2021 - Antonio Larrosa <[email protected]> + +- Fix %systemd_user_post. The --global parameter was handled as if + it was another service name so %systemd_user_post wasn't working + properly. Replace %systemd_user_post with the code from + %service_add_post it was being expanded to but correctly passing + --global to systemctl (boo#1183051, boo#1182661). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.jxWu7n/_old 2021-03-11 20:06:53.256138413 +0100 +++ /var/tmp/diff_new_pack.jxWu7n/_new 2021-03-11 20:06:53.260138419 +0100 @@ -17,7 +17,7 @@ Name: systemd-rpm-macros -Version: 10 +Version: 11 Release: 0 Summary: RPM macros for systemd License: LGPL-2.1-or-later ++++++ macros.systemd ++++++ --- /var/tmp/diff_new_pack.jxWu7n/_old 2021-03-11 20:06:53.304138488 +0100 +++ /var/tmp/diff_new_pack.jxWu7n/_new 2021-03-11 20:06:53.308138494 +0100 @@ -101,7 +101,7 @@ for service in %{?*} ; do \ if [ -e "/run/systemd/rpm/needs-preset/$service" ]; then \ /usr/bin/systemctl preset "$service" || : \ - rm -f /run/systemd/rpm/needs-preset/$service \ + rm "/run/systemd/rpm/needs-preset/$service" || : \ else \ /usr/lib/systemd/systemd-sysv-convert --apply %{?*} || : \ fi \ @@ -172,7 +172,27 @@ %systemd_postun() %{expand::%%service_del_postun_without_restart %{?**}} %systemd_postun_with_restart() %{expand::%%service_del_postun %{?**}} -%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}} +%systemd_user_pre() \ +if [ -x /usr/bin/systemctl ]; then \ + for service in %{?*} ; do \ + if [ ! -e "/usr/lib/systemd/user/$service" ]; then \ + mkdir -p /run/systemd/rpm/needs-user-preset \ + touch "/run/systemd/rpm/needs-user-preset/$service" \ + fi \ + done \ +fi \ +%{nil} + +%systemd_user_post() \ +if [ -x /usr/bin/systemctl ]; then \ + for service in %{?*} ; do \ + if [ -e "/run/systemd/rpm/needs-user-preset/$service" ]; then \ + /usr/bin/systemctl --global preset "$service" || : \ + rm "/run/systemd/rpm/needs-user-preset/$service" || : \ + fi \ + done \ +fi \ +%{nil} %systemd_user_preun() \ if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then \
