SPECS (AC-branch): gnome-applet-deskbar.spec - merged from HEAD - ...

[baggins]

Author: baggins                      Date: Wed May 17 13:12:58 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD
- BRs for GNOME 2.14

---- Files affected:
SPECS:
   gnome-applet-deskbar.spec (1.11 -> 1.11.2.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-applet-deskbar.spec
diff -u SPECS/gnome-applet-deskbar.spec:1.11 SPECS/gnome-applet-deskbar.spec:1.11.2.1
--- SPECS/gnome-applet-deskbar.spec:1.11	Wed Jan  4 15:50:57 2006
+++ SPECS/gnome-applet-deskbar.spec	Wed May 17 15:12:53 2006
@@ -7,12 +7,12 @@
 Summary:	GNOME applet similar to Google's Deskbar
 Summary(pl):	Aplet GNOME podobny do Google Deskbar
 Name:		gnome-applet-deskbar
-Version:	0.8.7
+Version:	2.14.1.1
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/0.8/%{_realname}-%{version}.tar.bz2
-# Source0-md5:	6ecb74c123b66aa2874d88b5b7cfbaf6
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.14/%{_realname}-%{version}.tar.bz2
+# Source0-md5:	9264c4cf5eaab4ac99009aea393d30ff
 Patch0:		%{name}-pyc.patch
 URL:		http://browserbookapp.sourceforge.net/deskbar.html
 BuildRequires:	GConf2-devel
@@ -20,16 +20,17 @@
 BuildRequires:	automake
 %{?with_evolution:BuildRequires:	evolution-data-server-devel}
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-desktop-devel >= 2.10
+BuildRequires:	gnome-desktop-devel >= 2.14.0
 BuildRequires:	intltool >= 0.33
 BuildRequires:	pkgconfig
+BuildRequires:	python-gnome-desktop-devel >= 2.14.0
 BuildRequires:	python-pygtk-devel >= 2.8.0
 BuildRequires:	rpmbuild(macros) >= 1.197
+Requires(post,preun):	GConf2
 Requires:	pydoc
-Requires:	python-gnome-extras-applet >= 2.12.0
+Requires:	python-gnome-desktop-applet >= 2.14.0
 Requires:	python-gnome-gconf >= 2.12.0
 Requires:	python-gnome-ui >= 2.12.0
-Requires(post,preun):	GConf2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,7 +50,7 @@
 %configure \
 	--disable-schemas-install \
 	--%{!?with_evolution:dis}%{?with_evolution:en}able-evolution
-	
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -58,7 +59,8 @@
 	pythondir=%{py_sitedir}
 
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/deskbar/*.py
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/deskbar/{evolution,gnomedesktop,iconentry,keybinder}/*.{la,py}
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/deskbar/*/*.{la,py}
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/deskbar/*/*/*.{la,py}
 rm -f $RPM_BUILD_ROOT%{_libdir}/deskbar-applet/handlers/*.py
 
 %find_lang %{_realname}
@@ -92,13 +94,26 @@
 %dir %{py_sitedir}/deskbar/gnomedesktop
 %dir %{py_sitedir}/deskbar/iconentry
 %dir %{py_sitedir}/deskbar/keybinder
-%{py_sitedir}/deskbar/*.py[co]
+%dir %{py_sitedir}/deskbar/osutils
+%dir %{py_sitedir}/deskbar/ui
+%dir %{py_sitedir}/deskbar/ui/completion
+%dir %{py_sitedir}/deskbar/ui/cuemiac
+%dir %{py_sitedir}/deskbar/ui/entriac
+
 %{py_sitedir}/deskbar/gnomedesktop/*.py[co]
 %{py_sitedir}/deskbar/iconentry/*.py[co]
 %{py_sitedir}/deskbar/keybinder/*.py[co]
+%{py_sitedir}/deskbar/osutils/*.py[co]
+%{py_sitedir}/deskbar/*.py[co]
+%{py_sitedir}/deskbar/ui/completion/*.py[co]
+%{py_sitedir}/deskbar/ui/cuemiac/*.py[co]
+%{py_sitedir}/deskbar/ui/entriac/*.py[co]
+%{py_sitedir}/deskbar/ui/*.py[co]
 %attr(755,root,root) %{py_sitedir}/deskbar/gnomedesktop/*.so
 %attr(755,root,root) %{py_sitedir}/deskbar/iconentry/*.so
 %attr(755,root,root) %{py_sitedir}/deskbar/keybinder/*.so
+%attr(755,root,root) %{py_sitedir}/deskbar/osutils/*.so
+
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/deskbar-applet.schemas
 
@@ -108,6 +123,37 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11.2.1  2006/05/17 13:12:53  baggins
+- merged from HEAD
+- BRs for GNOME 2.14
+
+Revision 1.20  2006/04/17 06:58:05  paladine
+- updated to 2.14.1.1
+
+Revision 1.19  2006/04/10 17:54:08  freetz
+- 2.14.1
+
+Revision 1.18  2006/03/14 07:01:31  freetz
+- 2.14.0.1
+
+Revision 1.17  2006/03/12 21:47:42  freetz
+- 2.14.0
+
+Revision 1.16  2006/02/28 23:37:25  glen
+- adapterized (killed trailing spaces/tabs)
+
+Revision 1.15  2006/02/28 15:09:49  freetz
+- 2.13.92
+
+Revision 1.14  2006/02/14 08:23:45  freetz
+- 2.13.91
+
+Revision 1.13  2006/02/04 22:13:53  freetz
+- 2.13.90.1
+
+Revision 1.12  2006/01/31 18:23:50  freetz
+- 2.13.90, updated file list, updated deps
+
 Revision 1.11  2006/01/04 14:50:57  freetz
 - 0.8.7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-applet-deskbar.spec?r1=1.11&r2=1.11.2.1&f=u