rpms/olpc-utils/OLPC-3 olpc-utils-dbus.patch, NONE, 1.1 olpc-utils.spec, 1.23, 1.24

[Marco Pesenti Gritti]

Author: mpg

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21753

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-dbus.patch 
Log Message:
* Sat Oct  1 2008 Marco Pesenti Gritti <mpg at redhat.com> 0.89-2
- Marco Pesenti Gritti (1):
    Make olpc-session launch a dbus-session before running sugar.



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 sugar-shell
+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/OLPC-3/olpc-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- olpc-utils.spec	18 Oct 2008 16:13:14 -0000	1.23
+++ olpc-utils.spec	18 Oct 2008 16:32:40 -0000	1.24
@@ -8,6 +8,8 @@
 Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: olpc-utils-dbus.patch
+
 # for olpc-dm
 BuildRequires:  pam-devel
 Requires:       pam
@@ -29,6 +31,7 @@
 %prep
 %setup -q
 
+%patch1 -p1
 
 %build
 make -f Makefile.build %{?_smp_mflags}