rpms/beagle/devel beagle.spec,1.135,1.136

[Adel Gadllah (drago01)]

Author: drago01

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

Modified Files:
	beagle.spec 
Log Message:
apply fixes from f9 to devel


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- beagle.spec	25 Apr 2008 17:44:17 -0000	1.135
+++ beagle.spec	17 May 2008 09:52:47 -0000	1.136
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.3.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 # see COPYING for details
@@ -33,6 +33,8 @@
 BuildRequires:  ndesk-dbus-glib-devel
 BuildRequires:	epiphany-devel
 BuildRequires:  taglib-sharp-devel
+BuildRequires:  unzip
+
 %ifarch ia64
 BuildRequires:  libunwind-devel
 %endif
@@ -66,6 +68,7 @@
 
 # firefox app if for beagle firefox extension
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
+%define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
 
 %description
 A general infrastructure for making your data easy to find. 
@@ -145,7 +148,7 @@
 %build
 autoconf
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-%configure --enable-wv1
+%configure --enable-wv1 --disable-googlebackends
 make %{?_smp_mflags}
 
 %install
@@ -160,9 +163,9 @@
 rm -f $RPM_BUILD_ROOT/etc/xdg/autostart/beagle-search-autostart.desktop
 
 # TODO: Isn't there a better place to install this?
-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}
+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}
 
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
@@ -271,6 +274,9 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sat May 17 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.7-3
+- Fix firefox extension installation
+
 * Fri Apr 25 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.7-2
 - Using nummeric compare for fedora version