Hello community,

here is the log from the commit of package dbus-1 for openSUSE:12.3 checked in 
at 2013-02-20 09:19:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/dbus-1 (Old)
 and      /work/SRC/openSUSE:12.3/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dbus-1", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:12.3/dbus-1/dbus-1-x11.changes   2013-01-31 
01:14:45.000000000 +0100
+++ /work/SRC/openSUSE:12.3/.dbus-1.new/dbus-1-x11.changes      2013-02-20 
09:20:01.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Feb 18 13:06:24 UTC 2013 - [email protected]
+
+- Revert patch: dbus-move-everything-to-run-directory.patch (bnc#802525). 
+
+-------------------------------------------------------------------
dbus-1.changes: same change

Old:
----
  dbus-move-everything-to-run-directory.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.9iAHvQ/_old  2013-02-20 09:20:01.000000000 +0100
+++ /var/tmp/diff_new_pack.9iAHvQ/_new  2013-02-20 09:20:01.000000000 +0100
@@ -61,8 +61,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] - move pid and any temp files to /run
-Patch2:         dbus-move-everything-to-run-directory.patch
 %if 0%{?suse_version} > 1100
 %bcond_without selinux
 %else
@@ -86,7 +84,6 @@
 %setup -n %{_name}-%{version} -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -fi
@@ -116,7 +113,7 @@
     --enable-systemd                                                   \
 %endif
     --enable-libaudit                                                  \
-    --with-console-auth-dir=/run/dbus/at_console/                      \
+    --with-console-auth-dir=/var/run/dbus/at_console/                  \
     --with-systemdsystemunitdir=%{_unitdir}                     
 make %{?_smp_mflags}
 doxygen -u && doxygen

++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.9iAHvQ/_old  2013-02-20 09:20:01.000000000 +0100
+++ /var/tmp/diff_new_pack.9iAHvQ/_new  2013-02-20 09:20:01.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] - move pid and any temp files to /run
-Patch2:         dbus-move-everything-to-run-directory.patch
 %if 0%{?suse_version} > 1100
 %bcond_without selinux
 %else
@@ -137,7 +135,6 @@
 %setup -n %{_name}-%{version} -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -fi
@@ -167,7 +164,7 @@
     --enable-systemd                                                   \
 %endif
     --enable-libaudit                                                  \
-    --with-console-auth-dir=/run/dbus/at_console/                      \
+    --with-console-auth-dir=/var/run/dbus/at_console/                  \
     --with-systemdsystemunitdir=%{_unitdir}                     
 make %{?_smp_mflags}
 doxygen -u && doxygen
@@ -180,7 +177,7 @@
 mkdir -p %{buildroot}/usr/sbin
 install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
 ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
-install -d %{buildroot}/run/dbus
+install -d %{buildroot}/var/run/dbus
 mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
 install -m 0644 %SOURCE2 \
     %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
@@ -214,7 +211,7 @@
 
 %pre
 /usr/sbin/groupadd -r messagebus 2> /dev/null || :
-/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g 
messagebus messagebus 2> /dev/null || :
+/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g 
messagebus messagebus 2> /dev/null || :
 %if 0%{?suse_version:1}
 
 %preun
@@ -260,7 +257,7 @@
 # See doc/system-activation.txt in source tarball for the rationale
 # behind these permissions
 %attr(4750,root,messagebus) %verify(not mode) 
/lib/%{name}/dbus-daemon-launch-helper
-%ghost /run/dbus
+%ghost /var/run/dbus
 %ghost %{_localstatedir}/lib/dbus/machine-id
 %if ! %{with_systemd}
 %if 0%{?suse_version} < 1230

++++++ dbus_at_console.ck ++++++
--- /var/tmp/diff_new_pack.9iAHvQ/_old  2013-02-20 09:20:01.000000000 +0100
+++ /var/tmp/diff_new_pack.9iAHvQ/_new  2013-02-20 09:20:01.000000000 +0100
@@ -4,7 +4,7 @@
 #
 reason="$1"
 
-dir=/run/dbus/at_console
+dir=/var/run/dbus/at_console
 
 # for at_console we are only interested in local sessions
 test "$CK_SESSION_IS_LOCAL" = true || exit 0

++++++ rc.boot.dbus ++++++
--- /var/tmp/diff_new_pack.9iAHvQ/_old  2013-02-20 09:20:01.000000000 +0100
+++ /var/tmp/diff_new_pack.9iAHvQ/_new  2013-02-20 09:20:01.000000000 +0100
@@ -22,7 +22,7 @@
 test -x $DBUS_DAEMON_BIN || exit 5
 
 DBUS_DAEMON_PARAMETER="--system";
-DBUS_DAEMON_PID_DIR="/run/dbus"
+DBUS_DAEMON_PID_DIR="/var/run/dbus"
 DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid
 
 DBUS_MACHINE_ID_DIR="/var/lib/dbus"
@@ -31,7 +31,7 @@
 DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen
 
 CONSOLEKIT_DAEMON_BIN="/usr/sbin/console-kit-daemon"
-CONSOLEKIT_PID_DIR="/run/ConsoleKit"
+CONSOLEKIT_PID_DIR="/var/run/ConsoleKit"
 CONSOLEKIT_PID=$CONSOLEKIT_PID_DIR/pid
 
 # Source LSB init functions
@@ -112,7 +112,7 @@
        ## Optional: Probe for the necessity of a reload, print out the
        ## argument to this init script which is required for a reload.
        ## Note: probe is not (yet) part of LSB (as of 1.2)
-       # test /etc/FOO/FOO.conf -nt /run/FOO.pid && echo reload
+       # test /etc/FOO/FOO.conf -nt /var/run/FOO.pid && echo reload
        ;;
     *)
        echo "Usage: $0 
{start|stop|status|try-restart|restart|force-reload|reload|probe}"

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to