Fix a dbus-launch problem

babysitter-x.patch

@@ -0,0 +1,12 @@
+diff -up dbus-1.1.4/tools/dbus-launch.c.babysitter-x dbus-1.1.4/tools/dbus-launch.c
+--- dbus-1.1.4/tools/dbus-launch.c.babysitter-x	2008-02-05 10:09:06.000000000 -0500
++++ dbus-1.1.4/tools/dbus-launch.c	2008-02-05 10:09:36.000000000 -0500
+@@ -966,6 +966,8 @@ main (int argc, char **argv)
+       char write_pid_fd_as_string[MAX_FD_LEN];
+       char write_address_fd_as_string[MAX_FD_LEN];
+ 
++      xdisplay = NULL;
++
+       if (close_stderr)
+ 	do_close_stderr ();
+ 

dbus.spec

@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -40,6 +40,7 @@ Conflicts: cups < 1:1.1.20-4
 Patch0: dbus-0.60-start-early.patch
 Patch1: dbus-1.0.1-generate-xml-docs.patch
 Patch2: ucred-and-limits.patch
+Patch3: babysitter-x.patch
 
 %description
 
@@ -96,6 +97,7 @@ in this separate package so server systems need not install X.
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .ucred-and-limits
+%patch3 -p1 -b .babysitter-x
 
 autoreconf -f -i
 
@@ -223,6 +225,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Feb  5 2008 Matthias Clasen <mclasen@redhat.com> - 1.1.4-4
+- Fix a dbus-launch problem (#430412)
+
 * Mon Feb  4 2008 Ray Strode <rstrode@redhat.com> - 1.1.4-3
 - Start message bus from xinitrc.d instead of hard coding it
 at the end of Xsession