rpms/dbus/FC-5 dbus-1.0.0-dont-die-on-error.patch, NONE, 1.1 dbus.spec, 1.76, 1.77

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/dbus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10319

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.0.0-dont-die-on-error.patch 
Log Message:
- if configuration changes and we can't read it, use the old config
  this fixes a bug durning upgrade where the configuration file
  adds a new element that current running bus does not understand
  grab this before you upgrade to fc6



dbus-1.0.0-dont-die-on-error.patch:
 main.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE dbus-1.0.0-dont-die-on-error.patch ---
--- dbus-1.0.0/bus/main.c.dont-die-on-error	2006-12-13 22:38:02.000000000 -0500
+++ dbus-1.0.0/bus/main.c	2006-12-13 22:38:05.000000000 -0500
@@ -163,7 +163,6 @@
       _dbus_warn ("Unable to reload configuration: %s\n",
 		  error.message);
       dbus_error_free (&error);
-      exit (1);
     }
   return TRUE;
 }


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-5/dbus.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- dbus.spec	13 Dec 2006 18:56:31 -0000	1.76
+++ dbus.spec	14 Dec 2006 22:19:19 -0000	1.77
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.62
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -54,7 +54,7 @@
 Patch4: dbus-0.61-mono-no-abi-version-change.patch 
 
 Patch5: dbus-0.22-fix-match-rule-equal.patch
-
+Patch6: dbus-1.0.0-dont-die-on-error.patch 
 %description
 
 D-BUS is a system for sending messages between applications. It is
@@ -145,6 +145,7 @@
 %patch4 -p1 -b .mono-no-abi-version-change
 
 %patch5 -p1 -b .fix-match-rule-equals
+%patch6 -p1 -b .dont-die-on-error
 autoreconf -f -i
 
 %build
@@ -345,6 +346,12 @@
 %endif
 
 %changelog
+* Thu Dec 14 2006 John (J5) Palmieri <johnp at redhat.com> - 0.62-0.2
+- if configuration changes and we can't read it, use the old config
+  this fixes a bug durning upgrade where the configuration file
+  adds a new element that current running bus does not understand
+  grab this before you upgrade to fc6
+
 * Wed Dec 13 2006 John (J5) Palmieri <johnp at redhat.com> - 0.62-0.1
 - Update to 0.62 to get bug fixes and allow Qt4 to run on FC5
 - Add security patch to fix denial of service bug CVE2006-6107