rpms/beagle/devel beagle.spec,1.119,1.120
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Sun Feb 17 17:25:08 UTC 2008
Author: drago01
Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1170
Modified Files:
beagle.spec
Log Message:
fix location of firefox extension; bug 433063
Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- beagle.spec 13 Feb 2008 19:01:03 -0000 1.119
+++ beagle.spec 17 Feb 2008 17:24:25 -0000 1.120
@@ -1,6 +1,6 @@
Name: beagle
Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Beagle Search Infrastructure
Group: User Interface/Desktops
# see COPYING for details
@@ -54,13 +54,9 @@
# Mono is not available on these arches
ExcludeArch: s390 s390x sparc64 ppc64
+#Firefox APP ID, for the beagle firefox extension
+%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
-# Firefox location info, for the beagle firefox plugin
-%if "%{_libdir}" == "/usr/lib64"
-%define grefile /etc/gre.d/gre64.conf
-%else
-%define grefile /etc/gre.d/gre.conf
-%endif
%description
A general infrastructure for making your data easy to find.
@@ -125,7 +121,8 @@
rm -f $RPM_BUILD_ROOT/etc/xdg/autostart/beagle-search-autostart.desktop
# TODO: Isn't there a better place to install this?
-install -m 644 firefox-extension/beagle.xpi $RPM_BUILD_ROOT%{_libdir}/beagle/
+install -m 644 firefox-extension/beagle.xpi \
+$RPM_BUILD_ROOT%{_libdir}/xulrunner/extensions/%{firefox_app_id}
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -179,23 +176,6 @@
rm -rf %{_libdir}/beagle/beagle-plugin-path
fi
-# install the firefox extension
-if [ -f %{grefile} ] ; then
- ffdir=$(cat %{grefile} | awk '/GRE_PATH/ { split($0,p,"="); print p[2] }')
-
- cd $ffdir/extensions
- mkdir beagle-extension
- unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi
- id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e 's/^ *//' -e "s/<[^<]*>//g" | tr -d "\n\r"`
- if [ -e "$id" ]; then
- rm -rf beagle-extension
- else
- mv beagle-extension "$id"
- fi
-
- echo "$ffdir/extensions/$id" > %{_libdir}/beagle/beagle-plugin-path
-fi
-
%post devel
if [ -x %{_bindir}/monodoc ]; then
%{_bindir}/monodoc --make-index > /dev/null
@@ -209,38 +189,6 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%triggerin -- firefox
-if [ -f %{_libdir}/beagle/beagle-plugin-path ]; then
- old=`cat %{_libdir}/beagle/beagle-plugin-path`
- rm -rf $old
- rm -rf %{_libdir}/beagle/beagle-plugin-path
-fi
-
-# install the firefox extension
-if [ -f %{grefile} ] ; then
- ffdir=$(cat %{grefile} | awk '/GRE_PATH/ { split($0,p,"="); print p[2] }')
-
- cd $ffdir/extensions
- mkdir beagle-extension
- unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi
- id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e 's/^ *//' -e "s/<[^<]*>//g" | tr -d "\n\r"`
- if [ -e "$id" ]; then
- rm -rf beagle-extension
- else
- mv beagle-extension "$id"
- fi
-
- echo "$ffdir/extensions/$id" > %{_libdir}/beagle/beagle-plugin-path
-fi
-
-%triggerun -- firefox
-# uninstall the firefox extension
-if [ $2 = 0 -a -f %{_libdir}/beagle/beagle-plugin-path ]; then
- old=`cat %{_libdir}/beagle/beagle-plugin-path`
- rm -rf $old
- rm -rf %{_libdir}/beagle/beagle-plugin-path
-fi
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README
@@ -280,8 +228,8 @@
%{_libdir}/beagle/DocExtractor.exe*
#Disabled for now (#205985)
#%{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
-# firefox plugin:
-%{_libdir}/beagle/beagle.xpi
+# firefox extension:
+%{_libdir}/xulrunner/extensions/%{firefox_app_id}/beagle.xpi
%{_datadir}/beagle
%{_mandir}/*/*
%dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
@@ -312,6 +260,9 @@
%{_libdir}/pkgconfig/beagle*.pc
%changelog
+* Sun Feb 17 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.3-3
+- Fix location of firefox extension (Christopher Aillon, #433063)
+
* Wed Feb 13 2008 Dennis Gilmore <dennis at ausil.us> - 0.3.3-2
- ia64 needs libunwind-devel
- change ExclusiveArch to ExcludeArch
More information about the fedora-extras-commits
mailing list