rpms/beagle/devel beagle.spec,1.141,1.142

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31552

Modified Files:
	beagle.spec 
Log Message:
fix bug 441375


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- beagle.spec	15 Jul 2008 12:23:23 -0000	1.141
+++ beagle.spec	19 Jul 2008 14:14:49 -0000	1.142
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 # see COPYING for details
@@ -64,6 +64,10 @@
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
 
+# thunderbird version and ext id for beagle extension
+%define thunderbird_version 2.0.0.14
+%define tb_ext_id \{b656ef18-fd76-45e6-95cc-8043f26361e7\}
+
 %description
 A general infrastructure for making your data easy to find. 
 
@@ -153,11 +157,16 @@
 # don't autostart the search gui
 rm -f $RPM_BUILD_ROOT/etc/xdg/autostart/beagle-search-autostart.desktop
 
-# TODO: Isn't there a better place to install this?
+# firefox extension
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id}
 unzip firefox-extension/beagle.xpi \
 -d $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id}
 
+# thunderbird extension
+mkdir -p  $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}
+unzip thunderbird-extension/beagle.xpi  \
+-d $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}
+
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-search.desktop
@@ -224,6 +233,8 @@
 %{_bindir}/
 %{_sbindir}/*
 %{_libdir}/beagle/
+%exclude %{_libdir}/beagle/Backends/Thunder*
+%exclude %{_libdir}/beagle/Backends/Evolution*
 %{_datadir}/beagle
 %{_mandir}/*/*
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
@@ -237,6 +248,7 @@
 %files thunderbird
 %defattr(-, root, root,-)
 %{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
+%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/
 
 %files epiphany
 %defattr(-, root, root,-)
@@ -265,6 +277,12 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sat Jul 19 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-2
+- RH #441375
+- Don't ship Thunderbird and Evolution backends in the main
+- package
+- Install thunderbird-extension correctly
+
 * Tue Jul 15 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-1
 - Update to 0.3.8
 - Drop unneeded patches