rpms/dbus/devel babysitter-x.patch,NONE,1.1 dbus.spec,1.138,1.139

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/pkgs/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31260

Modified Files:
	dbus.spec 
Added Files:
	babysitter-x.patch 
Log Message:
Fix a dbus-launch problem


babysitter-x.patch:

--- NEW FILE babysitter-x.patch ---
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 ();
 


Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- dbus.spec	4 Feb 2008 18:45:56 -0000	1.138
+++ dbus.spec	5 Feb 2008 15:14:22 -0000	1.139
@@ -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 @@
 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 @@
 %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 @@
 %{_includedir}/*
 
 %changelog
+* Tue Feb  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.1.4-4
+- Fix a dbus-launch problem (#430412)
+
 * Mon Feb  4 2008 Ray Strode <rstrode at redhat.com> - 1.1.4-3
 - Start message bus from xinitrc.d instead of hard coding it
 at the end of Xsession