rpms/deskbar-applet/devel deskbar-applet-2.13.91-beagleexists.patch, NONE, 1.1 deskbar-applet.spec, 1.18, 1.19

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

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

Modified Files:
	deskbar-applet.spec 
Added Files:
	deskbar-applet-2.13.91-beagleexists.patch 
Log Message:
Added beagle fix (#182728)

deskbar-applet-2.13.91-beagleexists.patch:

--- NEW FILE deskbar-applet-2.13.91-beagleexists.patch ---
--- deskbar-applet-2.13.91/deskbar/handlers/beagle.py.fedora	2006-02-24 05:30:48.000000000 -0500
+++ deskbar-applet-2.13.91/deskbar/handlers/beagle.py	2006-02-24 05:37:56.000000000 -0500
@@ -1,5 +1,6 @@
 import os
 from os.path import exists, join
+from glob import glob
 from gettext import gettext as _
 
 import gobject
@@ -9,7 +10,7 @@
 #FIXME: better way to detect beagle ?
 def _check_requirements():
 	for dir in get_xdg_data_dirs():
-		if exists(join(dir, "applications", "best.desktop")) or exists(join(dir, "applications", "beagle-search.desktop")):
+		if exists(join(dir, "applications", "best.desktop")) or glob(join(dir, "applications", "*beagle-search.desktop")):
 			return (deskbar.Handler.HANDLER_IS_HAPPY, None, None)
 	
 	return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, "Beagle does not seem to be installed, skipping", None)


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- deskbar-applet.spec	17 Feb 2006 07:07:49 -0000	1.18
+++ deskbar-applet.spec	24 Feb 2006 12:07:06 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.13.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 Source2:        fedorabz.png
 Patch0:         deskbar-applet-2.13.91-fedorabz.patch
 Patch1:         deskbar-applet-2.13.91-prctl.patch
+Patch2:         deskbar-applet-2.13.91-beagleexists.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2
@@ -40,6 +41,7 @@
 cp %{SOURCE2} data/art
 %patch -p1 -b .fedorabz
 %patch1 -p1 -b .prctl
+%patch2 -p1 -b .beagleexists
 
 %build
 %configure
@@ -88,11 +90,14 @@
 %{_datadir}/pixmaps/%{name}.svg
 
 %changelog
-* Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.90.1-2
+* Fri Feb 24 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.91-3
+- Added beagle fix (#182728)
+
+* Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.91-2
 - Added patch for prctl thinko
 - Added schema scripts
 
-* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.90.1-1
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.91-1
 - Upstream update
 
 * Thu Feb  2 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.90-1