From 4dd7db0039aaf4e468f59a55f02323673cea3e009e7c9cc88404fe6e9624dbf1 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 2 Nov 2020 08:55:25 +0000 Subject: [PATCH] document the previous change OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=41 --- macros.systemd | 10 +++++++--- systemd-rpm-macros.changes | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/macros.systemd b/macros.systemd index a6aa57f..407e966 100644 --- a/macros.systemd +++ b/macros.systemd @@ -75,7 +75,7 @@ if [ $1 -eq 1 ]; then \ else \ for service in %{?*} ; do \ # The tag file might have been left by a preceding \ - # update (see 1059627) \ + # update (see bsc#1059627) \ rm -f "/run/rpm-%{name}-update-$service-new-in-upgrade" \ \ if [ ! -e "/usr/lib/systemd/system/$service" ]; then \ @@ -134,6 +134,9 @@ fi \ # On uninstall, disable and stop services # +# Note: '-n' and '-f' options are still allowed to kept backward compatibility +# with SLE +# %service_del_preun(fn) \ if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then \ # Package removal, not upgrade \ @@ -160,8 +163,9 @@ fi \ # On uninstall, tell systemd to reload its unit files # # Options used if not in an installation systems -# -f that is force service restart in removal (deprecated) -# -n that do not touch active service (depredacted) +# -f : force service restart on update +# -n : do not touch active service (deprecated) +# # the default is to check for DISABLE_RESTART_ON_UPDATE environment # variable if not found use the value read from /etc/sysconfig/services # diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index 227d515..54401ac 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -3,6 +3,11 @@ Fri Oct 30 17:37:54 UTC 2020 - Franck Bui - Drop DISABLE_STOP_ON_REMOVAL support (jsc#SLE-8968) + %service_del_preun still accepts '-n' and '-f' options to keep + backward compatibility with SLE (as some packages share the same + devel project between SLE and openSUSE) but these options are now + ignored on Factory. + ------------------------------------------------------------------- Fri Sep 25 09:25:44 UTC 2020 - Franck Bui