rpms/gnome-applet-timer/F-13 gnome-applet-timer-2.1.2-gtk-runtimerror.patch, NONE, 1.1 gnome-applet-timer.spec, 1.35, 1.36

[tomspur]

Author: tomspur

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16220/F-13

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	gnome-applet-timer-2.1.2-gtk-runtimerror.patch 
Log Message:
gracefully exit, when there is no X

gnome-applet-timer-2.1.2-gtk-runtimerror.patch:
 timer-applet |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-gtk-runtimerror.patch ---
Index: src/timer-applet
===================================================================
--- src/timer-applet
+++ src/timer-applet	2010-06-20 19:15:48.990918147 +0200
@@ -19,7 +19,11 @@
 from os import path
 import gettext
 import sys
-import gtk
+try:
+    import gtk
+except RuntimeError:
+    print sys.stderr, "Couldn't import gtk. Have you a running X session?"
+    sys.exit(1)
 import gnomeapplet
 from timerapplet import config
 from timerapplet.controllers import GlobalController, TimerApplet, TimerService, TimerManagerService


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-13/gnome-applet-timer.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gnome-applet-timer.spec	23 Nov 2009 22:02:05 -0000	1.35
+++ gnome-applet-timer.spec	20 Jun 2010 17:31:16 -0000	1.36
@@ -4,7 +4,7 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -17,6 +17,9 @@ Patch0:         gnome-applet-timer-2.1.2
 # update default sounds for the recent freedesktop sound themes
 Patch1:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch
 Patch2:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=553757
+# When gtk fails to start, die gracefully
+Patch3:         gnome-applet-timer-2.1.2-gtk-runtimerror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -61,6 +64,7 @@ Timer Applet is a countdown timer applet
 %if 0%{?fedora} >= 12
 %patch2 -p1 -b .freedesktop-0.7
 %endif
+%patch3 -b .gtk-runtimeerror
 
 
 %build
@@ -119,6 +123,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Sun Jun 20 2010 Thomas Spura <tomspur at fedoraproject.org> 2.1.2-7
+- gracefully exit, when there is no X
+
 * Mon Nov 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-6
 - Fix assignment when default sound is not found (#531877)