rpms/deskbar-applet/devel deskbar-applet-gdmclient.patch, NONE, 1.1 deskbar-applet.spec, 1.50, 1.51

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29983

Modified Files:
	deskbar-applet.spec 
Added Files:
	deskbar-applet-gdmclient.patch 
Log Message:
* Fri Jun 29 2007 Luke Macken <lmacken at redhat.com> - 2.19.3-3
- Add deskbar-applet-gdmclient.patch to fix a nonfatal traceback on startup.
  (Upstream bug #452256)



deskbar-applet-gdmclient.patch:

--- NEW FILE deskbar-applet-gdmclient.patch ---
--- deskbar/handlers/gdmactions.py.orig	2007-06-29 11:29:10.000000000 -0400
+++ deskbar/handlers/gdmactions.py	2007-06-29 11:29:25.000000000 -0400
@@ -2,7 +2,7 @@
 from gettext import gettext as _
 import deskbar, deskbar.Indexer, deskbar.Handler, deskbar.Utils
 from deskbar.defs import VERSION
-import gdmclient
+from deskbar import gdmclient
 import gtk, gnome, gnome.ui
 
 HANDLERS = {


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- deskbar-applet.spec	6 Jun 2007 22:15:06 -0000	1.50
+++ deskbar-applet.spec	29 Jun 2007 15:41:38 -0000	1.51
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.19.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -13,6 +13,7 @@
 Source1:        fedorabz.py
 Source2:        fedorabz.png
 Patch0:         %{name}-firefox-searchplugins.patch
+Patch1:         %{name}-gdmclient.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
@@ -38,6 +39,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -103,6 +105,10 @@
 %{_datadir}/omf/deskbar/
 
 %changelog
+* Fri Jun 29 2007 Luke Macken <lmacken at redhat.com> - 2.19.3-3
+- Add deskbar-applet-gdmclient.patch to fix a nonfatal traceback on startup.
+  (Upstream bug #452256)
+
 * Wed Jun  6 2007 Luke Macken <lmacken at redhat.com> - 2.19.3-2
 - Add deskbar-applet-firefox-searchplugins.patch to fix the issue where 
   deskbar-applet does not find the default Firefox search plugins (Bug #242977