rpms/beagle/F-9 beagle.spec,1.137,1.138

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/beagle/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31475

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


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-9/beagle.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- beagle.spec	21 May 2008 18:26:02 -0000	1.137
+++ beagle.spec	19 Jul 2008 14:13:56 -0000	1.138
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.3.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 # see COPYING for details
@@ -67,10 +67,14 @@
 BuildRequires:	firefox-devel
 %endif
 
-# firefox app if for beagle firefox extension
+# firefox app id for beagle firefox extension
 %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. 
 
@@ -100,8 +104,7 @@
 Summary:      Beagle backend for Thunderbird
 Group:        User Interface/Desktops
 Requires:     beagle = %{version}-%{release}
-
-Requires: thunderbird
+Requires:     thunderbird = %{thunderbird_version}
 
 %description thunderbird
 Beagle backend for Thunderbird
@@ -163,11 +166,15 @@
 # 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			\
@@ -235,6 +242,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
@@ -248,6 +257,7 @@
 %files thunderbird
 %defattr(-, root, root,-)
 %{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
+%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/
 
 %files epiphany
 %defattr(-, root, root,-)
@@ -276,6 +286,12 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sat Jul 19 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.7-5
+- RH #441375
+- Don't ship Thunderbird and Evolution backends in the main
+- package
+- Install thunderbird-extension correctly 
+ 
 * Wed May 21 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.7-4
 - Enable chm support RH #447746