diff --git a/.cvsignore b/.cvsignore
index 15ca039..a753900 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tracker-0.6.3.tar.bz2
+tracker-0.6.4.tar.bz2
diff --git a/sources b/sources
index 1301d52..5872c0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f718aa38b7527229f5567834ae247a38 tracker-0.6.3.tar.bz2
+4f2d250d65f0be283ae456aede99a85b tracker-0.6.4.tar.bz2
diff --git a/tracker.spec b/tracker.spec
index 5fa1d9f..01b2861 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -1,15 +1,15 @@
Summary: An object database, tag/metadata database, search tool and indexer
Name: tracker
-Version: 0.6.3
-Release: 3%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://www.gnome.org/~jamiemcc/tracker/
Source0: http://www.gnome.org/~jamiemcc/tracker/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gmime-devel, poppler-devel, gettext
-BuildRequires: gnome-desktop-devel, gamin-devel, exempi-devel
-BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
+BuildRequires: gnome-desktop-devel, gamin-devel, libnotify-devel
+BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel, exempi-devel
BuildRequires: desktop-file-utils, intltool, deskbar-applet
BuildRequires: sqlite-devel, qdbm-devel, pygtk2-devel
@@ -51,14 +51,16 @@ GNOME libraries
%prep
%setup -q
%define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
-%if "%deskbar_applet_ver" >= "2.19"
+%if "%deskbar_applet_ver" >= "2.19.4"
%define deskbar_applet_dir %(pkg-config --variable modulesdir deskbar-applet)
+ %define deskbar_type module
%else
%define deskbar_applet_dir %(pkg-config --variable handlersdir deskbar-applet)
+ %define deskbar_type handler
%endif
%build
-%configure --disable-static --enable-deskbar-applet=auto \
+%configure --disable-static --enable-deskbar-applet=%{deskbar_type} \
--enable-external-qdbm
# Disable rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -71,8 +73,8 @@ rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
# Add an autostart for trackerd (for KDE)
-mkdir -p %{buildroot}%{_datadir}/autostart
-cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
+#mkdir -p %{buildroot}%{_datadir}/autostart
+#cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
desktop-file-install --delete-original \
--vendor="fedora" \
@@ -86,27 +88,22 @@ rm -rf %{buildroot}%{_libdir}/*.la
%clean
rm -rf %{buildroot}
-
%post -p /sbin/ldconfig
-
%post search-tool
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
-
%postun -p /sbin/ldconfig
-
%postun search-tool
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
-
%files -f %{name}.lang
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING NEWS README
@@ -137,9 +134,13 @@ fi
%{deskbar_applet_dir}/tracker*.py*
%{_datadir}/icons/*/*/apps/tracker.*
%{_datadir}/applications/*.desktop
-%{_datadir}/autostart/*.desktop
+#%{_datadir}/autostart/*.desktop
+%{_sysconfdir}/xdg/autostart/tracker-applet.desktop
%changelog
+* Mon Dec 11 2007 Deji Akingunola <dakingun@gmail.com> - 0.6.4-1
+- Version 0.6.4
+
* Tue Dec 04 2007 Deji Akingunola <dakingun@gmail.com> - 0.6.3-3
- Rebuild for exempi-1.99.5
diff --git a/trackerd-getenv.patch b/trackerd-getenv.patch
deleted file mode 100644
index 2aa4a34..0000000
--- a/trackerd-getenv.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up tracker-0.6.2/src/trackerd/tracker-apps.c.getenv tracker-0.6.2/src/trackerd/tracker-apps.c
---- tracker-0.6.2/src/trackerd/tracker-apps.c.getenv 2007-08-18 20:31:41.000000000 -0400
-+++ tracker-0.6.2/src/trackerd/tracker-apps.c 2007-09-11 12:47:38.000000000 -0400
-@@ -18,7 +18,8 @@
- * Boston, MA 02110-1301, USA.
- */
-
--#include<string.h>
-+#include <stdlib.h>
-+#include <string.h>
-
- #include "tracker-apps.h"
- #include "tracker-db.h"
-@@ -51,6 +52,7 @@ tracker_applications_add_service_directo
- value = getenv ("XDG_DATA_DIRS");
- if (value != NULL) {
- gchar **dir_array;
-+ tracker_log ("XDG_DATA_DIRS is at %p",value);
- dir_array = g_strsplit (value, ":", 0);
-
- gint i;