Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2019-06-05 11:38:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1" Wed Jun 5 11:38:23 2019 rev:158 rq:707154 version:1.12.12 Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1.changes 2019-05-10 09:08:57.950892417 +0200 +++ /work/SRC/openSUSE:Factory/.dbus-1.new.5148/dbus-1.changes 2019-06-05 11:38:25.783084064 +0200 @@ -1,0 +2,9 @@ +Wed May 29 13:25:43 UTC 2019 - Simon Lees <[email protected]> + +- Replace DISABLE_RESTART_ON_UPDATE with + %service_del_postun_without_restart +- Remove version specific code to block all updates on restart as + hopefully no tumbleweed versions still have code causing those + issues (was only present for a few snapshots) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.XTGX9b/_old 2019-06-05 11:38:27.523083841 +0200 +++ /var/tmp/diff_new_pack.XTGX9b/_new 2019-06-05 11:38:27.527083841 +0200 @@ -210,33 +210,6 @@ %{_sbindir}/useradd -r -s %{_bindir}/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus %service_add_pre dbus.service dbus.socket -# Lines below are temporary code to disable service restart on update [email protected] boo#1020301 -# These are potentially not needed on non tumbleweed systems where updates while running a desktop are not supported. -# This seems likely to only effect the last version of tumbleweed where the service files were added and can probably be -# removed reletavly soon. - -# Get the current version -if [ $1 -gt 1 ]; then - CURRENT_VER=$(%{_bindir}/dbus-daemon --version 2>/dev/null| sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1) - -# If the current version is or less then 1.10.2 where this change was added then migration needs to be run -# The following line will return 1.10.2 if its newer then the current version - TEST_VER=$(printf "1.10.2\n$CURRENT_VER" | sort -Vr | head -1) - - if [ "$TEST_VER" = "1.10.12" ]; then - if [ -f %{_sysconfdir}/sysconfig/services ]; then - cp -a %{_sysconfdir}/sysconfig/services %{_backup} - else - touch %{_backup} - fi - cat >>%{_sysconfdir}/sysconfig/services <<EOF -# temporarily added by rpm update to avoid dbus service restart -# backup saved in %{_backup} -DISABLE_RESTART_ON_UPDATE="yes" -EOF - fi -fi - %post if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id > /dev/null @@ -262,9 +235,7 @@ %service_del_preun dbus.service dbus.socket %postun -# immediately restarting the dbus service causes issues, As such wait for the next reboot to restart -export DISABLE_RESTART_ON_UPDATE=yes -%service_del_postun dbus.service dbus.socket +%service_del_postun_without_restart dbus.service dbus.socket %posttrans # See comments in pre
