rpms/deskbar-applet/devel .cvsignore, 1.3, 1.4 deskbar-applet.spec, 1.7, 1.8 fedorabz.py, 1.1, 1.2 sources, 1.3, 1.4

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

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

Modified Files:
	.cvsignore deskbar-applet.spec fedorabz.py sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2005 14:22:52 -0000	1.3
+++ .cvsignore	27 Nov 2005 06:27:07 -0000	1.4
@@ -1 +1 @@
-deskbar-applet-0.5.0.tar.gz
+deskbar-applet-0.8.5.tar.gz


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- deskbar-applet.spec	6 Oct 2005 04:15:29 -0000	1.7
+++ deskbar-applet.spec	27 Nov 2005 06:27:07 -0000	1.8
@@ -2,19 +2,19 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        0.5.0
-Release:        1
+Version:        0.8.5
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPL
 URL:            http://browserbookapp.sourceforge.net/deskbar.html
-Source0:        http://raphael.slinckx.net/files/%{name}-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/browserbookapp/%{name}-%{version}.tar.gz
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-0.5.0-fedorabz.patch
+Patch0:         deskbar-applet-0.8.2-fedorabz.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext
+BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf
 
 %description
@@ -32,9 +32,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fedorabz
 cp %{SOURCE1} deskbar/handlers
 cp %{SOURCE2} data/art
+%patch -p1 -b .fedorabz
 
 %build
 %configure
@@ -53,13 +53,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_libdir}/%{name}
 %{_libdir}/bonobo/servers/Deskbar_Applet.server
 %{python_sitelib}/deskbar
-%{_libexecdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Nov 27 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.5-1
+- Upstream update
+
 * Wed Oct  5 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-1
 - Upstream update
 - Added Fedora BZ handler


Index: fedorabz.py
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/fedorabz.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedorabz.py	6 Oct 2005 04:15:29 -0000	1.1
+++ fedorabz.py	27 Nov 2005 06:27:07 -0000	1.2
@@ -1,31 +1,34 @@
 from gettext import gettext as _
 
-import re
-import gnomevfs
-import handler
+import deskbar, deskbar.indexer
+import deskbar.handler
 
-PRIORITY=250
-bzurl="https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=%d"
-
-class FedorabzMatch(handler.Match):
-  def __init__(self, backend, url):
-    handler.Match.__init__(self, backend, url)
-    if url.isdigit():
-      self._num=url
-
-  def action(self, text=None):
-    gnomevfs.url_show(bzurl % int(self._num))
-
-  def get_verb(self):
-    return _("Open Fedora Bugzilla report #%(name)s")
-
-class FedorabzHandler(handler.Handler):
-  def __init__(self):
-    handler.Handler.__init__(self, "fedorabz.png")
-
-  def get_priority(self):
-    return PRIORITY
-
-  def query(self, query, max=5):
-    if query.isdigit():
-      return [FedorabzMatch(self, query)]
+HANDLERS = {
+	"FedoraBZHandler" : {
+		"name": _("Fedora Bugzilla Entries"),
+		"description": _("Open a Fedora Bugzilla entry by typing its number."),
+	}
+}
+
+bzurl="https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=%s"
+
+class FedoraBZMatch(deskbar.handler.Match):
+	def __init__(self, backend, url):
+		deskbar.handler.Match.__init__(self, backend, url)
+		if url.isdigit():
+			self._num=url
+				
+	def action(self, text=None):
+		gnomevfs.url_show(bzurl % self._num)
+		
+	def get_verb(self):
+		return _("Open Fedora Bugzilla report #%(name)s")
+				
+class FedoraBZHandler(deskbar.handler.Handler):
+	def __init__(self):
+		deskbar.handler.Handler.__init__(self, "fedorabz.png")
+		self._relative = True
+		
+	def query(self, query, max=5):
+		if query.isdigit():
+			return [FedorabzMatch(self, query)]


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2005 14:22:52 -0000	1.3
+++ sources	27 Nov 2005 06:27:07 -0000	1.4
@@ -1 +1 @@
-79d0bb05e40b77adc5db2ce0dd0f8325  deskbar-applet-0.5.0.tar.gz
+7f4963686dd92255d423014c5e404e68  deskbar-applet-0.8.5.tar.gz