rpms/olpc-utils/F-10 olpc-utils-dbus.patch, NONE, 1.1 olpc-utils.spec, 1.2, 1.3

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/olpc-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27988

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-dbus.patch 
Log Message:
- Actually add patch to cvs


olpc-utils-dbus.patch:

--- NEW FILE olpc-utils-dbus.patch ---
--- olpc-utils-0.89/usr/bin/olpc-session.dbus	2008-09-29 23:48:41.000000000 +0200
+++ olpc-utils-0.89/usr/bin/olpc-session	2008-10-18 18:14:15.000000000 +0200
@@ -74,5 +74,12 @@
 mv $HOME/.boot_time $HOME/.boot_time.prev 2>/dev/null
 cat /proc/uptime >$HOME/.boot_time
 
+# run the dbus session daemon
+if [ -f /etc/olpc-security ] ; then
+  DBUS_CONFIG="--config-file /etc/dbus-1/session-olpc.conf"
+fi
+
+eval `dbus-launch --sh-syntax --exit-with-session $DBUS_CONFIG`
+
 # finally, run sugar
 exec /usr/bin/ck-xinit-session /usr/bin/sugar


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-10/olpc-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- olpc-utils.spec	17 Nov 2008 23:52:18 -0000	1.2
+++ olpc-utils.spec	18 Nov 2008 00:01:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       olpc-utils
 Version:    0.89
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -91,6 +91,9 @@
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Mon Nov 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.89-6
+- Actually commit patch to cvs
+
 * Sat Oct 25 2008 Peter Robinson <pbrobinson at gmail.com> 0.89-5
 - Merge OLPC-3 branch into devel