Hello community,
here is the log from the commit of package systemd-rpm-macros for
openSUSE:Factory checked in at 2020-11-29 12:18:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-rpm-macros"
Sun Nov 29 12:18:35 2020 rev:32 rq:850414 version:9
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2020-11-23 16:21:28.107890351 +0100
+++
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.5913/systemd-rpm-macros.changes
2020-11-29 12:18:49.153419047 +0100
@@ -1,0 +2,31 @@
+Mon Nov 23 20:33:21 UTC 2020 - Franck Bui <f...@suse.com>
+
+- Bump version to 9
+
+-------------------------------------------------------------------
+Mon Nov 23 16:48:05 UTC 2020 - Franck Bui <f...@suse.com>
+
+- daemon-reload is not needed in %service_add_post
+
+ Applying presets, ie enabling/disabling units, doesn't require to
+ update units loaded in PID1 memory. It's actually needed after and
+ it's done implicitly by `systemctl preset`.
+
+-------------------------------------------------------------------
+Fri Nov 20 06:34:57 UTC 2020 - Franck Bui <f...@suse.com>
+
+- Rename the tag file used to detect when presets need to be applied
+
+ Rather than placing these tags directly under /run, let's place them
+ under /run/systemd/rpm. This also has the benefit to make the
+ workaround for bsc#1059627 no more needed.
+
+-------------------------------------------------------------------
+Thu Nov 19 15:53:43 UTC 2020 - Franck Bui <f...@suse.com>
+
+- %service_del_preun doesn't accept -f/-n options anymore
+
+ The few package calling %service_del_preun with '-f' or '-n' option
+ have been fixed. These options are not needed anymore.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.Egj0tY/_old 2020-11-29 12:18:49.853419755 +0100
+++ /var/tmp/diff_new_pack.Egj0tY/_new 2020-11-29 12:18:49.857419759 +0100
@@ -17,7 +17,7 @@
Name: systemd-rpm-macros
-Version: 8
+Version: 9
Release: 0
Summary: RPM macros for systemd
License: LGPL-2.1-or-later
++++++ macros.systemd ++++++
--- /var/tmp/diff_new_pack.Egj0tY/_old 2020-11-29 12:18:49.897419800 +0100
+++ /var/tmp/diff_new_pack.Egj0tY/_new 2020-11-29 12:18:49.897419800 +0100
@@ -71,33 +71,29 @@
%service_add_pre()
\
if [ $1 -gt 1 -a -x /usr/bin/systemctl ]; then
\
for service in %{?*} ; do
\
- # The tag file might have been left by a preceding
\
- # update (see bsc#1059627)
\
- rm -f "/run/rpm-%{name}-update-$service-new-in-upgrade"
\
-
\
if [ ! -e "/usr/lib/systemd/system/$service" ] &&
\
[ ! -e "/etc/init.d/${service%.*}" ]; then
\
- touch "/run/rpm-%{name}-update-$service-new-in-upgrade"
\
+ mkdir -p /run/systemd/rpm/needs-preset
\
+ touch "/run/systemd/rpm/needs-preset/$service"
\
fi
\
done
\
fi
\
%{nil}
# On install, tell systemd to reload its unit files
+#
%service_add_post()
\
if [ -x /usr/bin/systemctl ]; then
\
- # FIXME: why is this needed ?
\
- /usr/bin/systemctl daemon-reload || :
\
-
\
if [ $1 -eq 1 ]; then
\
/usr/bin/systemctl preset %{?*} || :
\
else
\
for service in %{?*} ; do
\
- if [ -e
"/run/rpm-%{name}-update-$service-new-in-upgrade" ]; then \
- rm -f
"/run/rpm-%{name}-update-$service-new-in-upgrade" \
+ if [ -e "/run/systemd/rpm/needs-preset/$service" ];
then \
/usr/bin/systemctl preset "$service" || :
\
fi
\
done
\
+ rm -fr /run/systemd/rpm/needs-preset
\
+
\
/usr/lib/systemd/systemd-sysv-convert --apply %{?*} || :
\
fi
\
fi
\
@@ -105,10 +101,7 @@
# On uninstall, disable and stop services
#
-# Note: '-n' and '-f' options are still allowed to keep backward compatibility
-# with SLE
-#
-%service_del_preun(fn)
\
+%service_del_preun()
\
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then
\
# Package removal, not upgrade
\
/usr/bin/systemctl --no-reload disable --now %{?*} || :
\
@@ -172,7 +165,7 @@
%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}}
-%systemd_preun(fn)
\
+%systemd_preun()
\
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then
\
# Package removal, not upgrade
\
/usr/bin/systemctl --no-reload disable --now %{?*} || :
\
@@ -182,7 +175,7 @@
%systemd_user_preun()
\
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then
\
# Package removal, not upgrade
\
- /usr/bin/systemctl --global disable %{?*} || : \
+ /usr/bin/systemctl --global disable %{?*} || :
\
fi
\
%{nil}
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
