rpms/deskbar-applet/devel .cvsignore, 1.25, 1.26 deskbar-applet.spec, 1.52, 1.53 fedorabz.py, 1.7, 1.8 sources, 1.25, 1.26 deskbar-applet-beagle-live.patch, 1.1, NONE deskbar-applet-desklicious-name.patch, 1.1, NONE deskbar-applet-desklicious-results.patch, 1.1, NONE deskbar-applet-desklicious-utils.patch, 1.1, NONE deskbar-applet-firefox-searchplugins.patch, 1.2, NONE deskbar-applet-gdmclient.patch, 1.1, NONE
Luke Macken (lmacken)
fedora-extras-commits at redhat.com
Tue Aug 21 21:09:12 UTC 2007
Author: lmacken
Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27867
Modified Files:
.cvsignore deskbar-applet.spec fedorabz.py sources
Removed Files:
deskbar-applet-beagle-live.patch
deskbar-applet-desklicious-name.patch
deskbar-applet-desklicious-results.patch
deskbar-applet-desklicious-utils.patch
deskbar-applet-firefox-searchplugins.patch
deskbar-applet-gdmclient.patch
Log Message:
* Sat Aug 21 2007 Luke Macken <lmacken at redhat.com> - 2.19.90.1-1
- 2.19.90.1
- Remove all patches, as they are all upstream now
- Update license tag to GPLv2
- New version of the Fedora bugzilla module
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 15 Jul 2007 16:02:24 -0000 1.25
+++ .cvsignore 21 Aug 2007 21:08:38 -0000 1.26
@@ -1 +1 @@
-deskbar-applet-2.19.5.tar.bz2
+deskbar-applet-2.19.90.1.tar.bz2
Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- deskbar-applet.spec 15 Jul 2007 16:02:25 -0000 1.52
+++ deskbar-applet.spec 21 Aug 2007 21:08:38 -0000 1.53
@@ -2,21 +2,16 @@
%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: deskbar-applet
-Version: 2.19.5
+Version: 2.19.90.1
Release: 1%{?dist}
Summary: A Gnome applet to allow easy access to various search engines
Group: Applications/Internet
-License: GPL
+License: GPLv2
URL: http://live.gnome.org/DeskbarApplet
Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.17/%{name}-%{version}.tar.bz2
Source1: fedorabz.py
Source2: fedorabz.png
-Patch0: %{name}-firefox-searchplugins.patch
-Patch1: %{name}-beagle-live.patch
-Patch2: %{name}-desklicious-utils.patch
-Patch3: %{name}-desklicious-results.patch
-Patch4: %{name}-desklicious-name.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
@@ -41,11 +36,6 @@
%prep
%setup -q
-%patch0 -b .firefox
-%patch1 -b .beagle-live
-%patch2 -b .desklicious-utils
-%patch3 -b .desklicious-results
-%patch4 -b .desklicious-name
%build
%configure --disable-schemas-install --disable-scrollkeeper
@@ -54,11 +44,9 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-hdir="$(grep "^handlersdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
-hdir="${hdir#*=}"
adir="$(grep "^artdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
adir="${adir#*=}"
-install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT$hdir
+install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT$adir
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
@@ -107,10 +95,17 @@
%{python_sitelib}/deskbar
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/gnome/help/deskbar/C/
%{_datadir}/omf/deskbar/
+%{_datadir}/gnome/help/deskbar/
+
%changelog
+* Sat Aug 21 2007 Luke Macken <lmacken at redhat.com> - 2.19.90.1-1
+- 2.19.90.1
+- Remove all patches, as they are all upstream now
+- Update license tag to GPLv2
+- New version of the Fedora bugzilla module
+
* Sat Jul 14 2007 Luke Macken <lmacken at redhat.com> - 2.19.5-1
- 2.19.5
- Add patch to fix beagle-live issue (Bug #248249) based on recommendations from
Index: fedorabz.py
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/fedorabz.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedorabz.py 14 Mar 2006 15:23:37 -0000 1.7
+++ fedorabz.py 21 Aug 2007 21:08:38 -0000 1.8
@@ -1,36 +1,47 @@
from gettext import gettext as _
-import deskbar
+import deskbar.interfaces.Action
+import deskbar.interfaces.Match
+import deskbar.interfaces.Module
import gnomevfs
-HANDLERS = {
- "FedoraBZHandler" : {
- "name": _("Fedora Bugzilla Entries"),
- "description": _("Open a Fedora Bugzilla entry by typing its number."),
- }
-}
-
+HANDLERS = ["FedoraBZModule"]
bzurl="https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=%s"
-class FedoraBZMatch(deskbar.Match.Match):
- def __init__(self, backend, **args):
- deskbar.Match.Match.__init__(self, backend, **args)
-
- def action(self, text=None):
- gnomevfs.url_show(bzurl % self.name)
-
- def get_category(self):
- return 'websearch'
-
- def get_verb(self):
- return _("Open Fedora Bugzilla report <b>#%(name)s</b>")
-
-class FedoraBZHandler(deskbar.Handler.Handler):
- def __init__(self):
- deskbar.Handler.Handler.__init__(self, "fedorabz.png")
-
- def query(self, query, max=5):
- if query.isdigit():
- return [FedoraBZMatch(self, name=query)]
- else:
- return []
+class FedoraBZAction(deskbar.interfaces.Action):
+ def __init__(self, bugnum):
+ deskbar.interfaces.Action.__init__(self, bugnum)
+ self._bugnum = bugnum
+
+ def activate(self, text=None):
+ gnomevfs.url_show(bzurl % self._bugnum)
+
+ def get_verb(self):
+ return _('Open Fedora Bugzilla report <b>#%(name)s</b>')
+
+ def is_valid(self, text=None):
+ return self._bugnum.isdigit()
+
+class FedoraBZMatch(deskbar.interfaces.Match):
+ def __init__(self, bugnum, **kwargs):
+ deskbar.interfaces.Match.__init__(self, bugnum=bugnum, icon="fedorabz.png",
+ category="web", **kwargs)
+ self.bugnum=bugnum
+ self.add_action(FedoraBZAction(bugnum))
+
+ def get_hash(self, text=None):
+ return self.bugnum
+
+class FedoraBZModule(deskbar.interfaces.Module):
+ INFOS = {
+ 'icon': deskbar.core.Utils.load_icon('fedorabz.png'),
+ 'name': 'Fedora Bugzilla Module',
+ 'description': 'Open a specific bug number in Fedora\'s Bugzilla',
+ 'version': '1.0.0.0',
+ }
+
+ def __init__(self):
+ deskbar.interfaces.Module.__init__(self)
+
+ def query(self, text):
+ self._emit_query_ready(text, [FedoraBZMatch(text)])
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 15 Jul 2007 16:02:25 -0000 1.25
+++ sources 21 Aug 2007 21:08:38 -0000 1.26
@@ -1 +1 @@
-d882cf0616af56f2aeed6002d468ee66 deskbar-applet-2.19.5.tar.bz2
+796449483182bb9929a97c9596fa8a2b deskbar-applet-2.19.90.1.tar.bz2
--- deskbar-applet-beagle-live.patch DELETED ---
--- deskbar-applet-desklicious-name.patch DELETED ---
--- deskbar-applet-desklicious-results.patch DELETED ---
--- deskbar-applet-desklicious-utils.patch DELETED ---
--- deskbar-applet-firefox-searchplugins.patch DELETED ---
--- deskbar-applet-gdmclient.patch DELETED ---
More information about the fedora-extras-commits
mailing list