[uxlaunch: 1/2] Add some patches for starting the UX

[Peter Robinson]

commit b4d18762cc4f72f36516b8ec908dd56e3603b6ce
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Oct 10 14:11:30 2010 +0100

    Add some patches for starting the UX

 fedora-netbook.desktop      |    8 ++++++++
 startmoblin                 |   13 +++++++++++++
 uxlaunch-myzone-speed.patch |   12 ++++++++++++
 uxlaunch.spec               |   21 ++++++++++++++++++---
 4 files changed, 51 insertions(+), 3 deletions(-)
---
diff --git a/fedora-netbook.desktop b/fedora-netbook.desktop
new file mode 100644
index 0000000..ca88bba
--- /dev/null
+++ b/fedora-netbook.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=startmoblin
+TryExec=startmoblin
+Name=Fedora Netbook
+Comment=Fedora's MeeGo User eXperience.
+Name[en_GB]=Fedora Netbook
diff --git a/startmoblin b/startmoblin
new file mode 100644
index 0000000..7c9314f
--- /dev/null
+++ b/startmoblin
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+export GCONF_DEFAULT_SOURCE_PATH=/etc/gconf/2/moblin.path
+export XDG_MENU_PREFIX=moblin-
+export XDG_DATA_DIRS=$HOME/.local/share/applications:/usr/share
+
+# load modmap settings
+test -r /etc/X11/Xmodmap && xmodmap /etc/X11/Xmodmap
+test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+
+exec /usr/sbin/uxlaunch -x
+
+
diff --git a/uxlaunch-myzone-speed.patch b/uxlaunch-myzone-speed.patch
new file mode 100644
index 0000000..8eb7fdd
--- /dev/null
+++ b/uxlaunch-myzone-speed.patch
@@ -0,0 +1,12 @@
+--- uxlaunch-0.56/desktop.c.orig	2010-08-30 22:40:53.000000000 +0100
++++ uxlaunch-0.56/desktop.c	2010-10-10 13:07:11.818054468 +0100
+@@ -418,6 +418,9 @@
+ 		while (ptrs[count] && count < 255)
+ 			ptrs[++count] = strtok(NULL, " \t");
+ 
++		/* give myzone a couple of seconds of un-interrupted grace */
++		if (entry->prio >= 0)
++			delay += 2000000;
+ 		usleep(delay);
+ 		lprintf("Starting %s with prio %d at %d", entry->exec, entry->prio, delay);
+ 		execvp(ptrs[0], ptrs);
diff --git a/uxlaunch.spec b/uxlaunch.spec
index d4b4e6f..cafa4a9 100644
--- a/uxlaunch.spec
+++ b/uxlaunch.spec
@@ -5,13 +5,16 @@
 
 Name:          uxlaunch
 Version:       0.56
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       A small and quick interface to start the Moblin Desktop
 
 Group:         User Interface/X
 License:       GPLv2
 URL:           http://www.meego.com/
 Source0:       %{tarfile}
+Source1:       fedora-netbook.desktop
+Source2:       startmoblin
+Patch0:        uxlaunch-myzone-speed.patch
 
 BuildRequires: ConsoleKit-devel
 BuildRequires: dbus-glib-devel
@@ -26,13 +29,14 @@ designed to get the Moblin Desktop running as quick as possible.
 
 %prep
 %setup -q
+%patch0 -p1 -b .myzone-speed
 
 # make build verbose
 sed -i 's!^\(\t\+\)@!\1!' Makefile
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} mutterlibexecdir=/usr/lib/mutter-moblin
 
 %install
 rm -rf %{buildroot}
@@ -42,17 +46,28 @@ make install DESTDIR=%{buildroot} INSTALL='install -p'
 chmod -x %{buildroot}/%{_sysconfdir}/sysconfig/uxlaunch
 chmod -x %{buildroot}/%{_datadir}/man/man1/uxlaunch*
 
+# To use this as a user session launcher  
+mkdir -p $RPM_BUILD_ROOT%{_bindir}  
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions  
+desktop-file-install --dir=%{buildroot}%{_datadir}/xsessions/ %{SOURCE1}
+install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/startmoblin
+  
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING
+%doc %{_datadir}/man/man1/uxlaunch.1.gz
 %config(noreplace) %{_sysconfdir}/sysconfig/uxlaunch
 %{_sbindir}/uxlaunch
-%doc %{_datadir}/man/man1/uxlaunch.1.gz
+%{_bindir}/startmoblin
+%{_datadir}/xsessions/fedora-netbook.desktop
 
 %changelog
+* Sun Oct 10 2010 Peter Robinson <pbrobinson at gmail.com> 0.56-2
+- Add some patches for starting the UX
+
 * Tue Sep  7 2010 Peter Robinson <pbrobinson at gmail.com> 0.56-1
 - New upstream 0.56 release