rpms/beagle/devel beagle.spec,1.121,1.122

[Adel Gadllah (drago01)]

Author: drago01

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

Modified Files:
	beagle.spec 
Log Message:
Fix bug #433063


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- beagle.spec	17 Feb 2008 17:56:10 -0000	1.121
+++ beagle.spec	21 Feb 2008 13:54:24 -0000	1.122
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.3.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 # see COPYING for details
@@ -37,7 +37,7 @@
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
 Requires: libbeagle
-
+Requires: xulrunner
 # This should be picked up automatically by dep, but there is
 # a problem with it. See bug #230212
 Requires: gsf-sharp
@@ -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,9 @@
 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/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}
+install -m 644 firefox-extension/beagle.xpi \
+$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}
 
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
@@ -179,23 +177,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 +190,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 +229,8 @@
 %{_libdir}/beagle/DocExtractor.exe*
 #Disabled for now (#205985)
 #%{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
-# firefox plugin:
-%{_libdir}/beagle/beagle.xpi
+# firefox extension:
+%{_libdir}/mozilla/extensions/%{firefox_app_id}/
 %{_datadir}/beagle
 %{_mandir}/*/*
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
@@ -310,8 +259,11 @@
 %{_libdir}/monodoc/sources/beagle-docs.tree
 %{_libdir}/monodoc/sources/beagle-docs.zip
 %{_libdir}/pkgconfig/beagle*.pc
- 
+
 %changelog
+* Thu Feb 21 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.3-5
+- Fix bug #433063
+
 * Sun Feb 17 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.3-4
 - Revert last change