commit systemd-rpm-macros for openSUSE:Factory
Hello community, here is the log from the commit of package systemd-rpm-macros for openSUSE:Factory checked in at 2018-02-16 21:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd-rpm-macros" Fri Feb 16 21:26:30 2018 rev:24 rq:576778 version:3 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes 2018-01-26 13:34:24.003585403 +0100 +++ /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes 2018-02-16 21:26:31.454388848 +0100 @@ -1,0 +2,12 @@ +Wed Feb 14 14:04:19 UTC 2018 - fbui@suse.com + +- Fix %systemd_post(): it's never called during package removal + + Also make it useful by restoring its original implementation. + +------------------------------------------------------------------- +Mon Feb 12 16:56:37 UTC 2018 - fbui@suse.com + +- Import more definitions from upstream (v237) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ macros.systemd ++++++ --- /var/tmp/diff_new_pack.64PbXE/_old 2018-02-16 21:26:32.850338468 +0100 +++ /var/tmp/diff_new_pack.64PbXE/_new 2018-02-16 21:26:32.850338468 +0100 @@ -20,16 +20,10 @@ # %service_del_postun demo.service # -# This is for systemctl -%systemd_requires \ -Requires(pre): systemd \ -Requires(post): systemd \ -Requires(preun): systemd \ -Requires(postun): systemd \ - %_unitdir /usr/lib/systemd/system %_userunitdir /usr/lib/systemd/user %_presetdir /usr/lib/systemd/system-preset +%_userpresetdir /usr/lib/systemd/user-preset %_udevhwdbdir /usr/lib/udev/hwdb.d %_udevrulesdir /usr/lib/udev/rules.d %_journalcatalogdir /usr/lib/systemd/catalog @@ -38,6 +32,23 @@ %_sysctldir /usr/lib/sysctl.d %_ntpunitsdir /usr/lib/systemd/ntp-units.d %_binfmtdir /usr/lib/binfmt.d +%_systemdgeneratordir /usr/lib/systemd/system-generators +%_systemdusergeneratordir /usr/lib/systemd/user-generators +%_systemd_system_env_generator_dir /usr/lib/systemd/system-environment-generators +%_systemd_user_env_generator_dir /usr/lib/systemd/user-environment-generators + +%systemd_requires \ +Requires(pre): systemd \ +Requires(post): systemd \ +Requires(preun): systemd \ +Requires(postun): systemd \ +%{nil} + +%systemd_ordering \ +OrderWithRequires(post): systemd \ +OrderWithRequires(preun): systemd \ +OrderWithRequires(postun): systemd \ +%{nil} %_restart_on_update_force() (\ test "$YAST_IS_RUNNING" = instsys && exit 0 \ @@ -181,18 +192,10 @@ fi \ %{nil} -# -# Options used if not in an installation systems -# -f that is fore service stop in removal -# -n that do not touch active service -# the default is to check for DISABLE_STOP_ON_REMOVAL environment -# variable if not found use the value read from /etc/sysconfig/services -# -%systemd_post(fn) \ -if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then \ - # Package removal, not upgrade \ - /usr/bin/systemctl --no-reload disable %{?*} || : \ - %{expand:%%_stop_on_removal%{-f:_force}%{!-f:%{-n:_never}} %{?*}} \ +%systemd_post() \ +if [ $1 -eq 1 -a -x /usr/bin/systemctl ] ; then \ + # Initial installation \ + /usr/bin/systemctl --no-reload preset %{?*} || : \ fi \ %{nil}
participants (1)
-
root@hilbert.suse.de