rpms/deskbar-applet/devel deskbar-applet-2.14.1-artdir.patch, NONE, 1.1 deskbar-applet-2.14.1-beagleexists.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 deskbar-applet.spec, 1.21, 1.22 sources, 1.10, 1.11 deskbar-applet-2.14.0-beagleexists.patch, 1.1, NONE deskbar-applet-2.14.0-fedorabz.patch, 1.1, NONE

Thu Apr 13 15:57:33 UTC 2006

Author: ivazquez

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

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Added Files:
	deskbar-applet-2.14.1-artdir.patch 
	deskbar-applet-2.14.1-beagleexists.patch 
Removed Files:
	deskbar-applet-2.14.0-beagleexists.patch 
	deskbar-applet-2.14.0-fedorabz.patch 
Log Message:
- Upstream update
- Decoupled the BZ handler from the upstream tarball


deskbar-applet-2.14.1-artdir.patch:

--- NEW FILE deskbar-applet-2.14.1-artdir.patch ---
--- deskbar-applet-2.14.1/data/deskbar-applet.pc.in.artdir	2006-04-13 07:25:47.000000000 -0400
+++ deskbar-applet-2.14.1/data/deskbar-applet.pc.in	2006-04-13 07:26:48.000000000 -0400
@@ -2,6 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 handlersdir=@libdir@/deskbar-applet/handlers
+artdir=@datadir@/deskbar-applet/art
 
 Name: Deskbar Applet Handlers Location
 Description: Providing the location of deskbar-applet system-wide handlers.

deskbar-applet-2.14.1-beagleexists.patch:

--- NEW FILE deskbar-applet-2.14.1-beagleexists.patch ---
--- deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py.fedora	2006-03-12 21:24:16.000000000 -0500
+++ deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py	2006-03-12 21:24: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 glob(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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Mar 2006 05:49:42 -0000	1.10
+++ .cvsignore	13 Apr 2006 15:57:33 -0000	1.11
@@ -1 +1 @@
-deskbar-applet-2.14.0.tar.bz2
+deskbar-applet-2.14.1.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- deskbar-applet.spec	14 Mar 2006 15:23:37 -0000	1.21
+++ deskbar-applet.spec	13 Apr 2006 15:57:33 -0000	1.22
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.14.0
-Release:        2%{?dist}
+Version:        2.14.1
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -12,14 +12,15 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.14/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-2.14.0-fedorabz.patch
-Patch2:         deskbar-applet-2.14.0-beagleexists.patch
+Patch0:         deskbar-applet-2.14.1-artdir.patch
+Patch1:         deskbar-applet-2.14.1-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
-Requires(pre): GConf2
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
+Provides:       deskbar-applet-fedorabz
 
 %description
 The goal of DeskbarApplet is to provide an omnipresent versatile search
@@ -32,10 +33,8 @@
 
 %prep
 %setup -q
-cp %{SOURCE1} deskbar/handlers
-cp %{SOURCE2} data/art
-%patch -p1 -b .fedorabz
-%patch2 -p1 -b .beagleexists
+%patch -p1 -b .artdir
+%patch1 -p1 -b .beagleexists
 
 %build
 %configure
@@ -44,6 +43,12 @@
 %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 %{SOURCE2} $RPM_BUILD_ROOT$adir
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 %{find_lang} %{name}
 
@@ -84,6 +89,10 @@
 %{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1-1
+- Upstream update
+- Decoupled the BZ handler from the upstream tarball
+
 * Tue Mar 14 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.0-2
 - Fixed bug in Fedora Bugzilla handler (#184231)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Mar 2006 05:49:42 -0000	1.10
+++ sources	13 Apr 2006 15:57:33 -0000	1.11
@@ -1 +1 @@
-2c9910160c2814e6497c5d6b6887fa8e  deskbar-applet-2.14.0.tar.bz2
+040bf4dd834005142a5a716bf76c2f20  deskbar-applet-2.14.1.tar.bz2


--- deskbar-applet-2.14.0-beagleexists.patch DELETED ---


--- deskbar-applet-2.14.0-fedorabz.patch DELETED ---


