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 2023-04-03 17:45:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.9019 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-rpm-macros"
Mon Apr 3 17:45:18 2023 rev:44 rq:1075207 version:20
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2023-01-28 18:44:10.190213221 +0100
+++
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.9019/systemd-rpm-macros.changes
2023-04-03 17:45:21.267153498 +0200
@@ -1,0 +2,19 @@
+Wed Mar 29 11:38:07 UTC 2023 - Franck Bui <f...@suse.com>
+
+- Bump to version 20
+
+-------------------------------------------------------------------
+Wed Mar 29 11:33:44 UTC 2023 - Franck Bui <f...@suse.com>
+
+- %service_del_postun: make sure to restart services if /etc/sysconfig/service
+ is not present.
+
+-------------------------------------------------------------------
+Wed Mar 29 10:40:14 UTC 2023 - Franck Bui <f...@suse.com>
+
+- Drop support for -n/-f options in %service_del_postun
+
+ These options have been deprecated since a long time and the last package
+ relying on them (drkonqi5) in the Factory repository has been updated.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.kdGKzo/_old 2023-04-03 17:45:21.983708293 +0200
+++ /var/tmp/diff_new_pack.kdGKzo/_new 2023-04-03 17:45:21.987711393 +0200
@@ -17,7 +17,7 @@
Name: systemd-rpm-macros
-Version: 19
+Version: 20
Release: 0
Summary: RPM macros for systemd
License: LGPL-2.1-or-later
++++++ macros.systemd ++++++
--- /var/tmp/diff_new_pack.kdGKzo/_old 2023-04-03 17:45:22.035748586 +0200
+++ /var/tmp/diff_new_pack.kdGKzo/_new 2023-04-03 17:45:22.043754784 +0200
@@ -66,20 +66,6 @@
Suggests: systemd \
%{nil}
-%_restart_on_update_force() /usr/bin/systemctl try-restart %{*} || : %{nil}
-%_restart_on_update_never() : # Restart of %{*} skipped %{nil}
-
-%_restart_on_update()
\
- if [ -e /etc/sysconfig/services ]; then
\
- DISABLE_RESTART_ON_UPDATE=
\
- . /etc/sysconfig/services
\
- case "$DISABLE_RESTART_ON_UPDATE" in
\
- yes|1) ;;
\
- *) /usr/bin/systemctl try-restart %{*} || :
\
- esac
\
- fi
\
-%{nil}
-
# Figure out when presets need to be applied. This information is only
# recorded during %pre and is actually applied during %post.
#
@@ -148,20 +134,23 @@
fi
\
%{nil}
-# On uninstall, tell systemd to reload its unit files
-#
-# Deprecated options, please do not use in new code:
-# -f : force restart on update (replaced by %service_del_postun_with_restart)
-# -n : don't restart on update (replaced by
%service_del_postun_without_restart)
-#
-# The default is to read DISABLE_RESTART_ON_UPDATE from /etc/sysconfig/services
+# On uninstall, tell systemd to reload its unit files.
+# On update, tell systemd to reload and restart service unless
+# DISABLE_RESTART_ON_UPDATE from /etc/sysconfig/services says otherwise
#
-%service_del_postun(fn)
\
+
+%service_del_postun()
\
if [ -x /usr/bin/systemctl ]; then
\
/usr/bin/systemctl daemon-reload || :
\
if [ $1 -ge 1 ]; then
\
# Package upgrade, not uninstall
\
- %{expand:%%_restart_on_update%{-f:_force}%{!-f:%{-n:_never}}
%{?*}} \
+ DISABLE_RESTART_ON_UPDATE=no
\
+ [ -e /etc/sysconfig/services ] && . /etc/sysconfig/services ||
: \
+
\
+ case "$DISABLE_RESTART_ON_UPDATE" in
\
+ yes|1) ;;
\
+ *) /usr/bin/systemctl try-restart %{*} || :
\
+ esac
\
fi
\
fi
\
%{nil}
@@ -174,7 +163,7 @@
%systemd_post() %{expand::%%service_add_post %{?**}}
%systemd_preun() %{expand::%%service_del_preun %{?**}}
%systemd_postun() %{expand::%%service_del_postun_without_restart %{?**}}
-%systemd_postun_with_restart() %{expand::%%service_del_postun %{?**}}
+%systemd_postun_with_restart() %{expand::%%service_del_postun_with_restart
%{?**}}
%systemd_user_pre()
\
if [ -x /usr/bin/systemctl ]; then
\
