Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2013-11-22 17:38:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1" Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2013-11-04 09:11:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2013-11-22 17:38:57.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 20 21:30:25 UTC 2013 - [email protected] + +- Drop the dbus-fall-back-to-old-run-directory.patch, and the sed + workaround from dbus-1-x11 %post, now that transition from 12.3 + (/var/run) to 13.1 (/run) is done + +------------------------------------------------------------------- dbus-1.changes: same change Old: ---- dbus-fall-back-to-old-run-directory.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.SoZXqC/_old 2013-11-22 17:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.SoZXqC/_new 2013-11-22 17:38:58.000000000 +0100 @@ -60,8 +60,6 @@ Patch0: dbus-log-deny.patch # PATCH-FIX-OPENSUSE [email protected] -- force a feature configure won't accept without x11 in buildrequires Patch1: dbus-do-autolaunch.patch -# PATCH-FIX-OPENSUSE [email protected] bnc#802525 - Avoid clients hanging after move to /run -Patch2: dbus-fall-back-to-old-run-directory.patch %bcond_without selinux %if %{with selinux} BuildRequires: libselinux-devel @@ -117,7 +115,6 @@ %setup -n %{_name}-%{version} -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build autoreconf -fi @@ -210,13 +207,6 @@ %{stop_on_removal dbus} %post -n dbus-1 -if [ -e /var/lib/old_run_path ]; then -# Temporarily override the socket path systemd sees, so the running D-Bus process won't be clobbered. This is needed as long -# upgrade path from 12.3 is supported (bnc#802525) -mkdir -p /run/systemd/system -/usr/bin/sed 's#ListenStream=/run/dbus/system_bus_socket#ListenStream=/var/run/dbus/system_bus_socket#' < /usr/lib/systemd/system/dbus.socket > /run/systemd/system/dbus.socket -rm /var/lib/old_run_path -fi /bin/dbus-uuidgen --ensure %{insserv_force_if_yast dbus} /sbin/ldconfig ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.SoZXqC/_old 2013-11-22 17:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.SoZXqC/_new 2013-11-22 17:38:58.000000000 +0100 @@ -55,8 +55,6 @@ Patch0: dbus-log-deny.patch # PATCH-FIX-OPENSUSE [email protected] -- force a feature configure won't accept without x11 in buildrequires Patch1: dbus-do-autolaunch.patch -# PATCH-FIX-OPENSUSE [email protected] bnc#802525 - Avoid clients hanging after move to /run -Patch2: dbus-fall-back-to-old-run-directory.patch %bcond_without selinux %if %{with selinux} BuildRequires: libselinux-devel @@ -105,7 +103,6 @@ %setup -n %{_name}-%{version} -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build autoreconf -fi ++++++ dbus-1-x11.spec.in ++++++ --- /var/tmp/diff_new_pack.SoZXqC/_old 2013-11-22 17:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.SoZXqC/_new 2013-11-22 17:38:58.000000000 +0100 @@ -124,13 +124,6 @@ %{stop_on_removal dbus} %post -n dbus-1 -if [ -e /var/lib/old_run_path ]; then -# Temporarily override the socket path systemd sees, so the running D-Bus process won't be clobbered. This is needed as long -# upgrade path from 12.3 is supported (bnc#802525) -mkdir -p /run/systemd/system -/usr/bin/sed 's#ListenStream=/run/dbus/system_bus_socket#ListenStream=/var/run/dbus/system_bus_socket#' < /usr/lib/systemd/system/dbus.socket > /run/systemd/system/dbus.socket -rm /var/lib/old_run_path -fi /bin/dbus-uuidgen --ensure %{insserv_force_if_yast dbus} /sbin/ldconfig -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
