rpms/deskbar-applet/devel deskbar-applet-2.13.90-fedorabz.patch, NONE, 1.1 deskbar-applet-2.13.90-gnomeapplet.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 deskbar-applet.spec, 1.12, 1.13 sources, 1.7, 1.8 deskbar-applet-0.8.6-fedorabz.patch, 1.1, NONE

Thu Feb 2 21:16:11 UTC 2006

Author: ivazquez

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

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Added Files:
	deskbar-applet-2.13.90-fedorabz.patch 
	deskbar-applet-2.13.90-gnomeapplet.patch 
Removed Files:
	deskbar-applet-0.8.6-fedorabz.patch 
Log Message:
Upstream update

deskbar-applet-2.13.90-fedorabz.patch:

--- NEW FILE deskbar-applet-2.13.90-fedorabz.patch ---
--- deskbar-applet-2.13.90/deskbar/handlers/Makefile.in.fedorabz	2006-01-30 17:43:23.000000000 -0500
+++ deskbar-applet-2.13.90/deskbar/handlers/Makefile.in	2006-02-02 02:12:28.000000000 -0500
@@ -238,7 +238,7 @@
 deskbar_handlersdir = $(libdir)/deskbar-applet/handlers
 deskbar_handlers_PYTHON = beagle.py beagle-live.py email_address.py \
 	epiphany.py files.py galago.py galeon.py gtkbookmarks.py \
-	google-live.py history.py mozilla.py programs.py \
+	google-live.py history.py mozilla.py programs.py fedorabz.py \
 	pathprograms.py volumes.py web_address.py $(am__append_1)
 EXTRA_DIST = \
 	debug-async_handler.py \
--- deskbar-applet-2.13.90/data/art/Makefile.in.fedorabz	2006-01-30 20:28:58.000000000 -0500
+++ deskbar-applet-2.13.90/data/art/Makefile.in	2006-02-02 02:09:44.000000000 -0500
@@ -244,6 +244,7 @@
 	deskbar-applet-panel-v.png \
 	deskbar-applet-panel-h.png \
 	deskbar-applet-small.png \
+	fedorabz.png \
 	folder-bookmark.png \
 	generic.png \
 	google.png

deskbar-applet-2.13.90-gnomeapplet.patch:

--- NEW FILE deskbar-applet-2.13.90-gnomeapplet.patch ---
--- deskbar-applet-2.13.90/configure.gnomeapplet	2006-02-02 10:31:07.000000000 -0500
+++ deskbar-applet-2.13.90/configure	2006-02-02 10:32:17.000000000 -0500
@@ -22089,30 +22089,7 @@
 
 
 
-py_mod_var=`echo gnomeapplet'_' | sed 'y%./+-%__p_%'`
-echo "$as_me:$LINENO: checking for python module gnomeapplet" >&5
-echo $ECHO_N "checking for python module gnomeapplet... $ECHO_C" >&6
-if eval "test \"\${py_cv_mod_$py_mod_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-prog="
-import sys
-try:
-        import gnomeapplet
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"
-if $PYTHON -c "$prog" 1>&5 2>&5
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-
-fi
+eval "py_cv_mod_gnomeapplet=yes"
 
 py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
 if test "x$py_val" != xno; then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Jan 2006 04:57:26 -0000	1.7
+++ .cvsignore	2 Feb 2006 21:16:11 -0000	1.8
@@ -1 +1 @@
-deskbar-applet-0.8.7.tar.bz2
+deskbar-applet-2.13.90.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- deskbar-applet.spec	3 Jan 2006 04:57:26 -0000	1.12
+++ deskbar-applet.spec	2 Feb 2006 21:16:11 -0000	1.13
@@ -2,20 +2,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        0.8.7
+Version:        2.13.90
 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://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/0.8/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.13/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-0.8.6-fedorabz.patch
+Patch0:         deskbar-applet-2.13.90-fedorabz.patch
+Patch1:         deskbar-applet-2.13.90-gnomeapplet.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
-Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf
+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
 
 %description
 This applet looks like the current Gnome Mini-Commander, but it launches search
@@ -35,6 +36,7 @@
 cp %{SOURCE1} deskbar/handlers
 cp %{SOURCE2} data/art
 %patch -p1 -b .fedorabz
+%patch1 -p1 -b .gnomeapplet
 
 %build
 %configure
@@ -55,10 +57,15 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_libdir}/%{name}
 %{_libdir}/bonobo/servers/Deskbar_Applet.server
+%{_libdir}/pkgconfig/%{name}.pc
 %{python_sitelib}/deskbar
 %{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Thu Feb  2 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.90-1
+- Upstream update
+
 * Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.7-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Jan 2006 04:57:26 -0000	1.7
+++ sources	2 Feb 2006 21:16:11 -0000	1.8
@@ -1 +1 @@
-6ecb74c123b66aa2874d88b5b7cfbaf6  deskbar-applet-0.8.7.tar.bz2
+fe8c47c622589a8b1e857ab6a2b0cd1b  deskbar-applet-2.13.90.tar.bz2


--- deskbar-applet-0.8.6-fedorabz.patch DELETED ---


