rpms/beagle/devel beagle-0.3.8-epiphany.patch, NONE, 1.1 beagle-thunderbird-update.sh, NONE, 1.1 beagle.spec, 1.143, 1.144
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Thu Jul 24 12:35:15 UTC 2008
Author: drago01
Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28479
Modified Files:
beagle.spec
Added Files:
beagle-0.3.8-epiphany.patch beagle-thunderbird-update.sh
Log Message:
fix epiphany and thunderbird extension
beagle-0.3.8-epiphany.patch:
--- NEW FILE beagle-0.3.8-epiphany.patch ---
diff -upNr beagle-0.3.8.orign/configure.in beagle-0.3.8/configure.in
--- beagle-0.3.8.orign/configure.in 2008-06-12 18:06:25.000000000 +0200
+++ beagle-0.3.8/configure.in 2008-07-24 14:17:24.000000000 +0200
@@ -402,7 +402,7 @@ if test "x$enable_epiphany_extension" !=
dnl If you want to add anything but a <major>.<minor> version here, you
dnl need to see the handling of the epiphany_version variable in the
dnl epiphany extension code
- VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
+ VALID_EPIPHANY_VERSIONS="2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
for v in $VALID_EPIPHANY_VERSIONS; do
AC_MSG_CHECKING([for Epiphany $v])
--- 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/devel/beagle.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- beagle.spec 20 Jul 2008 13:47:00 -0000 1.143
+++ beagle.spec 24 Jul 2008 12:34:29 -0000 1.144
@@ -1,13 +1,13 @@
Name: beagle
Version: 0.3.8
-Release: 3%{?dist}
+Release: 4%{?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
@@ -49,6 +49,7 @@
Patch5: beagle-0.2.15.1-libdir.patch
Patch6: beagle-monodoc.patch
Patch7: beagle-0.3.8-typo-fix.patch
+Patch8: beagle-0.3.8-epiphany.patch
# Mono is not available on these arches
ExcludeArch: s390 s390x sparc64 ppc64
@@ -65,7 +66,6 @@
%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
@@ -93,7 +93,6 @@
Summary: Beagle backend for Thunderbird
Group: User Interface/Desktops
Requires: beagle = %{version}-%{release}
-
Requires: thunderbird
%description thunderbird
@@ -139,6 +138,7 @@
%patch5 -p1 -b .libdir
%patch6 -p1 -b .monodoc
%patch7 -p1 -b .typo
+%patch8 -p1 -b .epiphany
%build
autoconf
@@ -163,9 +163,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 \
@@ -227,6 +227,34 @@
%{_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
@@ -240,6 +268,8 @@
%{_libdir}/beagle/
%exclude %{_libdir}/beagle/Backends/Thunder*
%exclude %{_libdir}/beagle/Backends/Evolution*
+%exclude %{_datadir}/beagle/beagle-thunderbird-update.sh
+%exclude %{_libdir}/beagle/thunderbird/
%{_datadir}/beagle
%{_mandir}/*/*
%dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
@@ -252,8 +282,9 @@
%files thunderbird
%defattr(-, root, root,-)
+%{_datadir}/beagle/beagle-thunderbird-update.sh
%{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
-%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/
+%{_libdir}/beagle/thunderbird/
%files epiphany
%defattr(-, root, root,-)
@@ -282,6 +313,10 @@
%{_libdir}/pkgconfig/beagle*.pc
%changelog
+* Thu Jul 24 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-4
+- Fix build against new epiphany
+- Remove versioned thunderbird requires
+
* Sun Jul 20 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-3
- Check if the user exists before creating RH #441175
More information about the scm-commits
mailing list