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

[Peter Robinson]

commit f412084c7741c2a01a2e2641c5bbc56f886bac48
Merge: b4d1876 435a9a9
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Oct 10 14:12:41 2010 +0100

    Add some patches for starting the UX

 uxlaunch-0.56-s390.patch |   12 ++++++++++++
 uxlaunch.spec            |    9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --cc uxlaunch.spec
index cafa4a9,cc0c3b1..5a624a6
--- a/uxlaunch.spec
+++ b/uxlaunch.spec
@@@ -5,16 -5,14 +5,17 @@@
  
  Name:          uxlaunch
  Version:       0.56
--Release:       2%{?dist}
++Release:       3%{?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}
 -Patch0:        %{name}-0.56-s390.patch
 +Source1:       fedora-netbook.desktop
 +Source2:       startmoblin
 +Patch0:        uxlaunch-myzone-speed.patch
++Patch1:        %{name}-0.56-s390.patch
  
  BuildRequires: ConsoleKit-devel
  BuildRequires: dbus-glib-devel
@@@ -29,7 -27,7 +30,8 @@@ designed to get the Moblin Desktop runn
  
  %prep
  %setup -q
 -%patch0 -p1 -b .s390
 +%patch0 -p1 -b .myzone-speed
++%patch1 -p1 -b .s390
  
  # make build verbose
  sed -i 's!^\(\t\+\)@!\1!' Makefile
@@@ -58,16 -50,14 +60,19 @@@ 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
++* Sun Oct 10 2010 Peter Robinson <pbrobinson at gmail.com> 0.56-3
 +- Add some patches for starting the UX
 +
+ * Fri Sep 24 2010 Dan Horák <dan[at]danny.cz> 0.56-2
+ - add support for s390(x)
+ 
  * Tue Sep  7 2010 Peter Robinson <pbrobinson at gmail.com> 0.56-1
  - New upstream 0.56 release