SPECS: gnome-applet-deskbar.spec - updated to 0.8.2 - added bconds...

[paladine]

Author: paladine                     Date: Tue Oct 25 21:22:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.8.2
- added bconds for beagle and evolution (removed todo)
- added missing Rs
- removed *.py where they're not needed
- fixed %%files

---- Files affected:
SPECS:
   gnome-applet-deskbar.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/gnome-applet-deskbar.spec
diff -u SPECS/gnome-applet-deskbar.spec:1.3 SPECS/gnome-applet-deskbar.spec:1.4
--- SPECS/gnome-applet-deskbar.spec:1.3	Mon Oct 24 22:29:54 2005
+++ SPECS/gnome-applet-deskbar.spec	Tue Oct 25 23:22:37 2005
@@ -1,33 +1,36 @@
 # $Revision$, $Date$
 #
-# TODO:
-# - beagle bcond
-# - evolution bcond
+# Conditional build:
+%bcond_with	beagle		# build with beagle support
+%bcond_without	evolution	# build without evolution support
 #
 %define		_realname	deskbar-applet
 Summary:	GNOME applet similar to Google's Deskbar
 Summary(pl):	Aplet GNOME podobny do Google Deskbar
 Name:		gnome-applet-deskbar
-Version:	0.8.0
+Version:	0.8.2
 Release:	0.1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/browserbookapp/%{_realname}-%{version}.tar.gz
-# Source0-md5:	8757a851d8f081c1236eb658b75e32dc
+# Source0-md5:	762dde3a98bb98907532e501520fae59
 URL:		http://browserbookapp.sourceforge.net/deskbar.html
 BuildRequires:	GConf2-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	beagle-devel
-BuildRequires:	evolution-data-server-devel
+%{?with_beagle:BuildRequires:	beagle-devel}
+%{?with_evolution:BuildRequires:	evolution-data-server-devel}
 BuildRequires:	gettext-devel
 BuildRequires:	intltool >= 0.33
 BuildRequires:	pkgconfig
 BuildRequires:	python-pygtk-devel >= 2.8.0
 BuildRequires:	rpmbuild(macros) >= 1.197
+%{?with_evolution:Requires:	evolution}
 Requires:	pydoc
 Requires:	python-gnome-extras-applet >= 2.12.0
 Requires:	python-gnome-gconf >= 2.12.0
+Requires:	python-gnome-ui >= 2.12.0
+Requires:	python-gnome-vfs >= 2.12.0
 Requires(post,preun):	GConf2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,8 +49,8 @@
 %{__automake}
 %configure \
 	--disable-schemas-install \
-	--enable-beagle \
-	--enable-evolution
+	--%{!?with_beagle:dis}%{?with_beagle:en}able-beagle \
+	--%{!?with_evolution:dis}%{?with_evolution:en}able-evolution
 	
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +58,9 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{py_sitescriptdir}/deskbar/*.py
+rm -f $RPM_BUILD_ROOT%{py_sitescriptdir}/deskbar/{beagle,evolution,iconentry,keybinder}/*.{la,py}
+
 %find_lang %{_realname}
 
 %clean
@@ -69,11 +75,29 @@
 %files -f %{_realname}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
+%{_datadir}/deskbar-applet
+%dir %{_libdir}/deskbar-applet
 %attr(755,root,root) %{_libdir}/deskbar-applet/deskbar-applet
+%{_libdir}/deskbar-applet/handlers
 %{_libdir}/bonobo/servers/*.server
-%{_libdir}/deskbar-applet
-%{py_sitescriptdir}/deskbar
-%{_datadir}/deskbar-applet
+%dir %{py_sitescriptdir}/deskbar
+%if %{with beagle}
+%dir %{py_sitescriptdir}/deskbar/beagle
+%{py_sitescriptdir}/deskbar/beagle/*.py[co]
+%attr(755,root,root) %{py_sitescriptdir}/deskbar/beagle/*.so
+%endif
+%if %{with evolution}
+%dir %{py_sitescriptdir}/deskbar/evolution
+%{py_sitescriptdir}/deskbar/evolution/*.py[co]
+%attr(755,root,root) %{py_sitescriptdir}/deskbar/evolution/*.so
+%endif
+%dir %{py_sitescriptdir}/deskbar/iconentry
+%dir %{py_sitescriptdir}/deskbar/keybinder
+%{py_sitescriptdir}/deskbar/*.py[co]
+%{py_sitescriptdir}/deskbar/iconentry/*.py[co]
+%{py_sitescriptdir}/deskbar/keybinder/*.py[co]
+%attr(755,root,root) %{py_sitescriptdir}/deskbar/iconentry/*.so
+%attr(755,root,root) %{py_sitescriptdir}/deskbar/keybinder/*.so
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/deskbar-applet.schemas
 
@@ -83,6 +107,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/10/25 21:22:37  paladine
+- updated to 0.8.2
+- added bconds for beagle and evolution (removed todo)
+- added missing Rs
+- removed *.py where they're not needed
+- fixed %%files
+
 Revision 1.3  2005/10/24 20:29:54  freetz
 - updated to 0.8.0 (in conspiration with paladine), added beagle
   and evolution handlers
================================================================

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