rpms/beagle/F-9 beagle-thunderbird-update.sh, NONE, 1.1 beagle.spec, 1.139, 1.140

[Adel Gadllah (drago01)]

Author: drago01

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

Modified Files:
	beagle.spec 
Added Files:
	beagle-thunderbird-update.sh 
Log Message:
remove hardcoded thunderbird dep


--- NEW FILE beagle-thunderbird-update.sh ---
#!/bin/sh
# 
# This script is used to add and remove our extension from the thunderbird
# directory, and is run from 'triggers' when thunderbird is installed or
# upgraded, as well as when our package is installed. It is needed because
# thunderbird is installed into versioned directories in /usr/lib[64]/thunderbird
# Based on firefox-update.sh from mugshot
if [ "$1" = "install" ] ; then
    for libdir in /usr/lib /usr/lib64 ; do
	# Add symlinks to any thunderbird directory that looks like it is part of a
	# currently installed package
	for d in $libdir/thunderbird*; do
	    if [ "$d" = "$libdir/thunderbird*" ] ; then
		continue
	    fi
	    link=$d/extensions/\{b656ef18-fd76-45e6-95cc-8043f26361e7\}
	    target=$libdir/beagle/thunderbird
	    if [ -e $target -a -e $d/thunderbird-bin -a -d $d/extensions -a ! -L $link ] ; then
		ln -s $target $link
	    fi
	done
    done
elif [ "$1" = "remove" ] ; then
    for libdir in /usr/lib /usr/lib64 ; do
	# Remove any symlinks we've created into any thunderbird directory
	for d in $libdir/thunderbird*; do
	    if [ "$d" = "$libdir/thunderbird*" ] ; then
		continue
	    fi
	    link=$d/extensions/\{b656ef18-fd76-45e6-95cc-8043f26361e7\}
	    if [ -L $link ] ; then
		rm $link
	    fi
	done
     done
else
    echo "Usage thunderbird-update.sh [install/remove]"
fi


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-9/beagle.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- beagle.spec	22 Jul 2008 16:42:23 -0000	1.139
+++ beagle.spec	23 Jul 2008 23:33:39 -0000	1.140
@@ -1,13 +1,13 @@
 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
 License:        ASL 2.0 and MIT and BSD and CC-BY and LGPLv2+ and (AFL or LGPLv2+)
 URL:            http://beagle-project.org/
 Source0:        http://download.gnome.org/sources/beagle/0.3/%{name}-%{version}.tar.bz2
-
+Source1:	beagle-thunderbird-update.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel
@@ -101,7 +101,7 @@
 Summary:      Beagle backend for Thunderbird
 Group:        User Interface/Desktops
 Requires:     beagle = %{version}-%{release}
-Requires:     thunderbird = %{thunderbird_version}
+Requires:     thunderbird
 
 %description thunderbird
 Beagle backend for Thunderbird
@@ -169,9 +169,9 @@
 -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}
+mkdir -p  $RPM_BUILD_ROOT%{_libdir}/beagle/thunderbird
+unzip thunderbird-extension/beagle.xpi  -d $RPM_BUILD_ROOT%{_libdir}/beagle/thunderbird
+install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/beagle/beagle-thunderbird-update.sh
 
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
@@ -233,6 +233,35 @@
   %{_bindir}/monodoc --make-index > /dev/null
 fi
 
+#############################
+# thunderbird extension hacks
+# copied from mugshot to deal with versioned 
+# thunderbird dirs
+%post thunderbird
+%{_datadir}/beagle/beagle-thunderbird-update.sh install
+
+%preun thunderbird
+%{_datadir}/beagle/beagle-thunderbird-update.sh remove
+
+%postun thunderbird
+if [ "$1" != 0 ] ; then
+  test -x %{_datadir}/beagle/beagle-thunderbird-update.sh && %{_datadir}/beagle/beagle-thunderbird-update.sh install
+fi
+
+%triggerin thunderbird -- thunderbird
+%{_datadir}/beagle/beagle-thunderbird-update.sh install
+
+%triggerun thunderbird -- thunderbird
+%{_datadir}/beagle/beagle-thunderbird-update.sh remove
+
+%triggerpostun thunderbird -- thunderbird
+if [ "$1" != 0 ] ; then
+  test -x %{_datadir}/beagle/beagle-thunderbird-update.sh && %{_datadir}/beagle/beagle-thunderbird-update.sh install
+fi
+
+# thunderbird extension hacks
+#################################
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -246,7 +275,8 @@
 %{_libdir}/beagle/
 %exclude %{_libdir}/beagle/Backends/Thunder*
 %exclude %{_libdir}/beagle/Backends/Evolution*
-%{_datadir}/beagle
+%exclude %{_datadir}/beagle/beagle-thunderbird-update.sh
+%exclude %{_datadir}/beagle
 %{_mandir}/*/*
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle/indexes
@@ -258,6 +288,7 @@
 
 %files thunderbird
 %defattr(-, root, root,-)
+%{_datadir}/beagle/beagle-thunderbird-update.sh
 %{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
 %{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/
 
@@ -288,6 +319,10 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Thu Jul 24 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-2
+- Remove versioned thubderbird deps by using the same hack as
+  mugshot
+
 * Tue Jul 22 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-1
 - Update to 0.3.8
 - Check if the user exists before creating RH #441175