--- a/ChangeLog Mon Mar 09 05:07:01 2009 +0000
+++ b/ChangeLog Mon Mar 09 13:15:35 2009 +0000
@@ -1,3 +1,16 @@
+2009-03-09 Jerry Tan <[email protected]>
+
+ * patches/tracker-03-man.diff
+ * patches/tracker-14-disable-home-index.diff
+ * patches/tracker-11-removetag.diff
+ * patches/tracker-18-replace-odt2txt-with-o3read.diff
+ * patches/libgc-02-change-location.diff
+ * patches/tracker-02-disable-autostart.diff
+ * patches/tracker-17-upgrade.diff
+ * SUNWdesktop-search.spec
+ * base-specs/tracker.spec
+ bump tracker to 0.6.90
+
2009-03-09 Jeff Cai <[email protected]>
* base-specs/evolution-data-server.spec:
--- a/SUNWdesktop-search.spec Mon Mar 09 05:07:01 2009 +0000
+++ b/SUNWdesktop-search.spec Mon Mar 09 13:15:35 2009 +0000
@@ -146,9 +146,11 @@
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
+#%dir %attr (0755, root, bin) %{_libexecdir}
+#%{_libexecdir}/*
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/*.so*
-%{_libdir}/tracker
+%{_libdir}/tracker*
%dir %attr (0755, root, bin) %{_libdir}/deskbar-applet
%dir %attr (0755, root, bin) %{_libdir}/deskbar-applet/modules-2.20-compatible
%{_libdir}/deskbar-applet/modules-2.20-compatible/tracker-module.py
@@ -158,7 +160,13 @@
%{_datadir}/applications/*.desktop
%dir %attr (0755, root, bin) %{_datadir}/dbus-1
%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/dbus-1/services/org.freedesktop.Tracker.*
+%dir %attr (0755, root, bin) %{_datadir}/gtk-doc
+%dir %attr (0755, root, bin) %{_datadir}/gtk-doc/html
+%dir %attr (0755, root, bin) %{_datadir}/gtk-doc/html/libtracker-common
+%{_datadir}/gtk-doc/html/libtracker-common/*
+%dir %attr (0755, root, bin) %{_datadir}/gtk-doc/html/libtracker-module
+%{_datadir}/gtk-doc/html/libtracker-module/*
%dir %attr (0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
%{_mandir}/*/*
--- a/base-specs/tracker.spec Mon Mar 09 05:07:01 2009 +0000
+++ b/base-specs/tracker.spec Mon Mar 09 13:15:35 2009 +0000
@@ -12,14 +12,14 @@
Name: tracker
License: GPL v2
Group: Applications/System
-Version: 0.6.6
+Version: 0.6.90
# DO NOT BUMP TO 0.6.90 until we make it ready - check with [email protected]
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
URL: http://www.tracker-project.org
Summary: Desktop search tool
-Source: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-%{version}.tar.gz
Source1: l10n-configure.sh
Source2: %{name}-po-sun-%{po_sun_version}.tar.bz2
# date:2008-01-23 owner:jerrytan type:branding
@@ -54,6 +54,10 @@
Patch15: tracker-15-libumem-check.diff
# date:2009-02-16 owner:jerrytan type:bug bugster:6802570
Patch16: tracker-16-extract-jpeg-core-dump.diff
+# date:2009-02-24 owner:jerrytan type:
+Patch17: %{name}-17-upgrade.diff
+# date:2009-03-04 owner:jerrytan type:
+Patch18: %{name}-18-replace-odt2txt-with-o3read.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gmime-devel, poppler-devel, gettext
@@ -91,28 +95,30 @@
%prep
%setup -q
-%patch10 -p1
+#%patch10 -p1
bash %SOURCE1 --enable-sun-linguas
bzcat %SOURCE2 | tar xf -
cd po-sun; make; cd ..
-%patch1 -p1
+#%patch1 -p1
%if %option_with_sun_branding
%patch2 -p1
%endif
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+#%patch4 -p1
+#%patch5 -p1
+#%patch6 -p1
+#%patch7 -p1
+#%patch8 -p1
+#%patch9 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p1
+#%patch13 -p1
%patch14 -p1
-%patch15 -p1
-%patch16 -p1
+#%patch15 -p1
+#%patch16 -p1
+%patch17 -p1
+%patch18 -p1
%build
%ifos linux
@@ -140,11 +146,13 @@
--bindir=%{_bindir} \
--mandir=%{_mandir} \
--libdir=%{_libdir} \
+ --libexecdir=%{_bindir} \
--datadir=%{_datadir} \
--includedir=%{_includedir} \
--sysconfdir=%{_sysconfdir} \
--disable-warnings \
--enable-external-sqlite \
+# --enable-evolution-plugin\
make -j $CPUS
@@ -171,7 +179,9 @@
%{_bindir}/tracker*
%{_datadir}/tracker/
%{_datadir}/pixmaps/tracker/
-%{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/dbus-1/services/org.freedesktop.Tracker.*
+%{_datadir}/gtk-doc/
+%{_libexecdir}/tracker*
%{_libdir}/*.so.*
%{_mandir}/man1/tracker*.1.gz
%{_sysconfdir}/xdg/autostart/trackerd.desktop
@@ -183,6 +193,10 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed Mar 04 2009 - [email protected]
+- Add tracker-18-replace-odt2txt-with-o3read.diff to use o3read until odt2txt introduced
+* Tue Feb 24 2009 - [email protected]
+- Add tracker-17-upgrade.diff to upgrade to tracker0.6.90
* Mon Feb 16 2009 - [email protected]
- Add tracker-16-extract-jpeg-core-dump.diff to fix bug 6802570
* Fri Feb 06 2009 - [email protected]
--- a/patches/tracker-02-disable-autostart.diff Mon Mar 09 05:07:01 2009 +0000
+++ b/patches/tracker-02-disable-autostart.diff Mon Mar 09 13:15:35 2009 +0000
@@ -1,7 +1,7 @@
Index: trunk/trackerd.desktop.in.in
===================================================================
--- trunk/trackerd.desktop.in.in (revision 1092)
-+++ trunk/trackerd.desktop.in.in (working copy)
++++ trunk/data/trackerd.desktop.in.in (working copy)
@@ -7,7 +7,7 @@
Terminal=false
Type=Application
--- a/patches/tracker-03-man.diff Mon Mar 09 05:07:01 2009 +0000
+++ b/patches/tracker-03-man.diff Mon Mar 09 13:15:35 2009 +0000
@@ -1,5 +1,5 @@
---- tracker-0.6.6/docs/tracker-applet.1.old 2008年 7月 31日 四 14:52:32
-+++ tracker-0.6.6/docs/tracker-applet.1 2008年 7月 31日 四 15:29:28
+--- tracker-0.6.6/docs/tracker-applet.1.old 2008��� 7��� 31��� ��� 14:52:32
++++ tracker-0.6.6/docs/manpages/tracker-applet.1 2008��� 7��� 31��� ��� 15:29:28
@@ -1,4 +1,6 @@
+'\" te
.TH tracker-applet 1 "November, 2007" GNU "User Commands"
@@ -32,8 +32,8 @@
+.sp
+
+
---- tracker-0.6.6/docs/tracker-extract.1.old 2008年 7月 31日 四 14:53:08
-+++ tracker-0.6.6/docs/tracker-extract.1 2008年 7月 31日 四 15:29:28
+--- tracker-0.6.6/docs/tracker-extract.1.old 2008��� 7��� 31��� ��� 14:53:08
++++ tracker-0.6.6/docs/manpages/tracker-extract.1 2008��� 7��� 31��� ��� 15:29:28
@@ -1,4 +1,7 @@
+'\" te
+
@@ -66,21 +66,21 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-files.1.old 2008年 7月 31日 四 14:55:13
-+++ tracker-0.6.6/docs/tracker-files.1 2008年 7月 31日 四 15:29:28
-@@ -1,5 +1,8 @@
+--- tracker-0.6.6/docs/tracker-files.1.old 2008��� 7��� 31��� ��� 14:55:13
++++ tracker-0.6.6/docs/manpages/tracker-files.1 2008��� 7��� 31��� ��� 15:29:28
+@@ -1,4 +1,7 @@
+'\" te
.TH tracker-files 1 "July 2007" GNU "User Commands"
+...\" LSARC 2008/375 Meta Tracker
-
+
+
.SH NAME
tracker-files \- Return files filtered by the mime type or their category
- (called ServiceType)
-@@ -29,3 +32,23 @@
+@@ -27,4 +31,24 @@
+
.SH SEE ALSO
.BR trackerd (1),
- .BR tracker-services (7).
+ .BR tracker-services (1).
+
+.SH "ATTRIBUTES"
+.PP
@@ -101,21 +101,48 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-meta-folder.1.old 2008年 7月 31日 四 15:27:17
-+++ tracker-0.6.6/docs/tracker-meta-folder.1 2008年 7月 31日 四 15:29:28
-@@ -1,5 +1,8 @@
+--- tracker-0.6.6/docs/tracker-meta-folder.1.old 2008��� 7��� 31��� ��� 15:27:17
++++ tracker-0.6.6/docs/manpages/tracker-meta-folder.1 2008��� 7��� 31��� ��� 15:29:28
+@@ -1,36 +1,59 @@
+'\" te
.TH tracker-meta-folder 1 "July, 2007" GNU "User Commands"
+...\" LSARC 2008/375 Meta Tracker
-
+
+
.SH NAME
- tracker-meta-folder \- return list of files indexed by tracker for a folder
+ tracker-meta-folder \- return list of files indexed by tracker for a
+ folder with their value for the selected properties
+
+ .SH SYNOPSIS
+ .B tracker-meta-folder
+ \-p FOLDER [Properties]
+
+ .SH DESCRIPTION
+ .B tracker-meta-folder
+ shows in stdout the list of files and their values for the selected
+ properties indexed by tracker and stored under the
+ folder provided as parameter.
-@@ -13,3 +16,23 @@
+ .SH OPTIONS
+ .TP
+ \-p FOLDER
+ The path you are asking for.
+
+ .TP
+ PROPERTIES
+ A list of properties to show per file. For more information on valid
+ properties see
+ .BR tracker-services (1).
+
+ .SH EXAMPLES
+ .TP
+ The mimetypes of all the files in the test/ folder:
+ .BR
+ $ tracker-meta-folder /x/y/test File:Mime
.SH SEE ALSO
- .BR trackerd(1).
+ .BR trackerd (1).
+ .BR tracker-services (1)
+
+.SH "ATTRIBUTES"
+.PP
@@ -136,8 +163,8 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-preferences.1.old 2008年 7月 31日 四 15:27:28
-+++ tracker-0.6.6/docs/tracker-preferences.1 2008年 7月 31日 四 15:29:28
+--- tracker-0.6.6/docs/tracker-preferences.1.old 2008��� 7��� 31��� ��� 15:27:28
++++ tracker-0.6.6/docs/manpages/tracker-preferences.1 2008��� 7��� 31��� ��� 15:29:28
@@ -1,5 +1,8 @@
+'\" te
.TH tracker-preferences 1 "November, 2007" GNU "User Commands"
@@ -171,8 +198,8 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-query.1.old 2008年 7月 31日 四 15:27:39
-+++ tracker-0.6.6/docs/tracker-query.1 2008年 7月 31日 四 15:29:28
+--- tracker-0.6.6/docs/tracker-query.1.old 2008��� 7��� 31��� ��� 15:27:39
++++ tracker-0.6.6/docs/manpages/tracker-query.1 2008��� 7��� 31��� ��� 15:29:28
@@ -1,4 +1,6 @@
+'\" te
.TH tracker-query 1 "July 2007" GNU "User Commands"
@@ -181,9 +208,9 @@
.SH NAME
tracker-query \- command line tool to query tracker database
@@ -34,3 +36,23 @@
- .SH "SEE ALSO"
+ .SH SEE ALSO
.BR trackerd (1),
- .BR tracker-services (7).
+ .BR tracker-services (1).
+
+.SH "ATTRIBUTES"
+.PP
@@ -204,21 +231,20 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-search.1.old 2008年 7月 31日 四 15:27:49
-+++ tracker-0.6.6/docs/tracker-search.1 2008年 7月 31日 四 15:29:28
-@@ -1,5 +1,8 @@
+--- tracker-0.6.6/docs/tracker-search.1.old 2008��� 7��� 31��� ��� 15:27:49
++++ tracker-0.6.6/docs/manpages/tracker-search.1 2008��� 7��� 31��� ��� 15:29:28
+@@ -1,4 +1,7 @@
+'\" te
.TH tracker-search 1 "July 2007" GNU "User Commands"
+...\" LSARC 2008/375 Meta Tracker
-
+
+
.SH NAME
tracker-search \- command line tool to search documents indexed by
- trackerd
-@@ -37,3 +40,23 @@
+@@ -41,3 +43,23 @@
.BR trackerd (1),
.BR tracker-search-tool (1),
- .BR tracker-services (7).
+ .BR tracker-services (1).
+
+.SH "ATTRIBUTES"
+.PP
@@ -239,8 +265,8 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-search-tool.1.old 2008年 7月 31日 四 15:28:04
-+++ tracker-0.6.6/docs/tracker-search-tool.1 2008年 7月 31日 四 15:29:28
+--- tracker-0.6.6/docs/tracker-search-tool.1.old 2008��� 7��� 31��� ��� 15:28:04
++++ tracker-0.6.6/docs/manpages/tracker-search-tool.1 2008��� 7��� 31��� ��� 15:29:28
@@ -1,5 +1,8 @@
+'\" te
.TH tracker-search-tool 1 "July, 2007" GNU "User Commands"
@@ -274,18 +300,17 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-services.7.old 2008年 7月 31日 四 15:28:16
-+++ tracker-0.6.6/docs/tracker-services.7 2008年 7月 31日 四 15:29:43
-@@ -1,5 +1,8 @@
+--- tracker-0.6.6/docs/tracker-services.7.old 2008��� 7��� 31��� ��� 15:28:16
++++ tracker-0.6.6/docs/manpages/tracker-services.1 2008��� 7��� 31��� ��� 15:29:43
+@@ -1,5 +1,7 @@
+'\" te
- .TH tracker-services 7 "July 2007" GNU "Conventions"
+ .TH tracker-services 1 "July 2007" GNU "Conventions"
+...\" LSARC 2008/375 Meta Tracker
-
-+
+
.SH NAME
- tracker-services \- service types of trackerd
-
-@@ -58,3 +61,23 @@
+ tracker-services \- shows service types and propeties available in trackerd
+
+@@ -77,3 +79,23 @@
.BR tracker-search-tool (1),
.BR tracker-query (1),
.BR tracker-files (1).
@@ -309,8 +334,8 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-stats.1.old 2008年 7月 31日 四 15:28:34
-+++ tracker-0.6.6/docs/tracker-stats.1 2008年 7月 31日 四 15:29:28
+--- tracker-0.6.6/docs/tracker-stats.1.old 2008��� 7��� 31��� ��� 15:28:34
++++ tracker-0.6.6/docs/manpages/tracker-stats.1 2008��� 7��� 31��� ��� 15:29:28
@@ -1,5 +1,8 @@
+'\" te
.TH tracker-stats 1 "July 2007" GNU "User Commands"
@@ -344,8 +369,8 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-status.1.old 2008年 7月 31日 四 15:28:46
-+++ tracker-0.6.6/docs/tracker-status.1 2008年 7月 31日 四 15:29:28
+--- tracker-0.6.6/docs/tracker-status.1.old 2008��� 7��� 31��� ��� 15:28:46
++++ tracker-0.6.6/docs/manpages/tracker-status.1 2008��� 7��� 31��� ��� 15:29:28
@@ -1,5 +1,8 @@
+'\" te
.TH tracker-status 1 "July 2007" GNU "User Commands"
@@ -379,17 +404,16 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-tag.1.old 2008年 7月 31日 四 15:28:56
-+++ tracker-0.6.6/docs/tracker-tag.1 2008年 7月 31日 四 15:29:28
-@@ -1,5 +1,8 @@
+--- tracker-0.6.6/docs/tracker-tag.1.old 2008��� 7��� 31��� ��� 15:28:56
++++ tracker-0.6.6/docs/manpages/tracker-tag.1 2008��� 7��� 31��� ��� 15:29:28
+@@ -1,4 +1,7 @@
+'\" te
- .TH tracker-tag 1 "July, 2007" GNU "User Commands"
+ .TH tracker-tag 1 "July 2007" GNU "User Commands"
+...\" LSARC 2008/375 Meta Tracker
-
+
+
.SH NAME
tracker-tag \- command line tool for setting and searching tags/keywords
-
@@ -43,3 +46,23 @@
.PP
This manual page was written by Michael Biebl <[email protected]>,
@@ -414,8 +438,8 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/tracker-thumbnailer.1.old 2008年 7月 31日 四 15:29:09
-+++ tracker-0.6.6/docs/tracker-thumbnailer.1 2008年 7月 31日 四 15:29:28
+--- tracker-0.6.6/docs/tracker-thumbnailer.1.old 2008��� 7��� 31��� ��� 15:29:09
++++ tracker-0.6.6/docs/manpages/tracker-thumbnailer.1 2008��� 7��� 31��� ��� 15:29:28
@@ -1,5 +1,8 @@
+'\" te
.TH tracker-thumbnailer 1 "July, 2007" GNU "User Commands"
@@ -423,9 +447,9 @@
+
.SH NAME
- tracker-thumbnailer \- create freedesktop.org compliant thumbnails
+ tracker-thumbnailer \- create freedesktop.org compliant thumbnails (Deprecated)
-@@ -46,3 +49,23 @@
+@@ -56,3 +59,23 @@
.PP
This manual page was written by Michael Biebl <[email protected]>,
for the Debian project (but may be used by others).
@@ -449,8 +473,8 @@
+.TE
+.sp
+
---- tracker-0.6.6/docs/trackerd.1.old 2008年 7月 31日 四 16:35:10
-+++ tracker-0.6.6/docs/trackerd.1 2008年 7月 31日 四 16:36:52
+--- tracker-0.6.6/docs/trackerd.1.old 2008��� 7��� 31��� ��� 16:35:10
++++ tracker-0.6.6/docs/manpages/trackerd.1 2008��� 7��� 31��� ��� 16:36:52
@@ -1,4 +1,6 @@
+'\" te
.TH trackerd 1 "July 2007" GNU "User Commands"
@@ -458,7 +482,7 @@
.SH NAME
trackerd \- indexer daemon for tracker search tool
-@@ -100,7 +102,12 @@
+@@ -95,16 +102,38 @@
needs a
.BR dbus-daemon(1)
to be running within your current session.
@@ -466,15 +490,20 @@
+Please check tracker releasenotes on solaris platform on
+.PP
+\fBhttp://opensolaris\&.org/os/project/jds/tasks/MetaTracker/\fR\&.
-
+
+
.SH SEE ALSO
.BR tracker-search-tool (1),
.BR tracker-search (1),
-@@ -110,3 +117,23 @@
+ .BR tracker-tag (1),
+ .BR tracker-stats (1),
+ .BR tracker-query (1),
.BR tracker-meta-folder (1),
.BR tracker-files (1),
- .BR tracker-services (7).
+ .BR tracker-services (1),
+ .BR tracker-info (1),
+ .BR tracker-status (1),
+ .BR tracker-services (1)
+
+.SH "ATTRIBUTES"
+.PP
@@ -496,7 +525,7 @@
+.sp
+
--- tracker-0.6.6/docs/tracker.cfg.5.old 2008-10-13 15:19:22.999069000 +0800
-+++ tracker-0.6.6/docs/tracker.cfg.5 2008-10-13 15:21:42.667625000 +0800
++++ tracker-0.6.6/docs/manpages/tracker.cfg.5 2008-10-13 15:21:42.667625000 +0800
@@ -1,4 +1,6 @@
+'\" te
.TH tracker.cfg 5 "July 2007" GNU "Configuration Files"
@@ -504,7 +533,7 @@
.SH NAME
tracker.cfg \- configuration file for the trackerd search daemon
-@@ -201,3 +203,23 @@
+@@ -230,3 +232,23 @@
.SH SEE ALSO
.BR tracker(1)
--- a/patches/tracker-11-removetag.diff Mon Mar 09 05:07:01 2009 +0000
+++ b/patches/tracker-11-removetag.diff Mon Mar 09 13:15:35 2009 +0000
@@ -1,16 +1,22 @@
--- tracker-0.6.6/src/libtracker-gtk/tracker-tag-bar.c.old Mon Feb 25 09:21:19 2008
+++ tracker-0.6.6/src/libtracker-gtk/tracker-tag-bar.c Fri Aug 22 16:52:18 2008
-@@ -165,11 +165,12 @@
+@@ -165,13 +165,14 @@
{
TrackerTagBarPrivate *priv;
GError *error = NULL;
- char *args[1];
+-
+ char *args[2] ;
-
++
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
-
+-
++
args[0] = g_strdup (priv->active_tag);
+-
+- tracker_keywords_remove(priv->client, priv->type, priv->uri,
+ args[1] = NULL;
-
- tracker_keywords_remove(priv->client, priv->type, priv->uri,
++
++ tracker_keywords_remove(priv->client, priv->type, priv->uri,
args, &error);
+ if (error) {
+ g_print ("Tag Removal Error : %s", error->message);
--- a/patches/tracker-14-disable-home-index.diff Mon Mar 09 05:07:01 2009 +0000
+++ b/patches/tracker-14-disable-home-index.diff Mon Mar 09 13:15:35 2009 +0000
@@ -1,68 +1,35 @@
---- tracker-0.6.6/src/trackerd/tracker-utils.c.old 2008-10-31 13:21:19.685141000 +0800
-+++ tracker-0.6.6/src/trackerd/tracker-utils.c 2008-10-31 13:22:54.398307000 +0800
-@@ -2572,7 +2572,7 @@
- "LowMemoryMode=false\n\n",
- "[Watches]\n",
- "# List of directory roots to index and watch seperated by semicolons\n",
-- "WatchDirectoryRoots=", g_get_home_dir (), ";\n",
-+ "WatchDirectoryRoots=\n",
- "# List of directory roots to index but not watch (no live updates but are refreshed when trackerd is next restarted) seperated by semicolons\n",
- "CrawlDirectory=\n",
- "# List of directory roots to not index and not watch seperated by semicolons\n",
-@@ -2610,8 +2610,8 @@
- "# Pause indexer when disk space gets below equal/below this value, in %% of the $HOME filesystem. Set it to a value smaller then zero to disable pausing at all.\n",
- "LowDiskSpaceLimit=1\n\n",
- "[Emails]\n",
-- "IndexEvolutionEmails=true\n",
-- "IndexThunderbirdEmails=true\n\n",
-+ "IndexEvolutionEmails=false\n",
-+ "IndexThunderbirdEmails=false\n\n",
- "[Performance]\n",
- "# Maximum size of text in bytes to index from a file's text contents\n",
- "MaxTextToIndex=1048576\n",
-@@ -2630,7 +2630,7 @@
- "# Alters how much padding is used to prevent index relocations. Higher values improve indexing speed but waste more disk space. Value should be in range (1..8)\n",
- "Padding=2\n",
- "# Sets stack size of trackerd threads in bytes. The default on Linux is 8Mb (0 will use the system default).\n",
-- "ThreadStackSize=0\n",
-+ "ThreadStackSize=8388608\n",
- NULL);
+diff -ur tracker-0.6.90-orig/src/libtracker-common/tracker-config.c tracker-0.6.90/src/libtracker-common/tracker-config.c
+--- tracker-0.6.90-orig/src/libtracker-common/tracker-config.c 2009-03-05 11:44:38.036074000 +0800
++++ tracker-0.6.90/src/libtracker-common/tracker-config.c 2009-03-05 11:47:24.828770000 +0800
+@@ -791,12 +791,11 @@
+ gchar *language;
+ const gchar *watch_directory_roots[2] = { NULL, NULL };
+ const gchar *empty_string_list[] = { NULL };
++ const gchar *disabled_modules_list[] = { "evolution", NULL };
+
+ /* Get default values */
+ language = tracker_language_get_default_code ();
- g_file_set_contents (filename, contents, strlen (contents), NULL);
---- tracker-0.6.6/src/tracker-preferences/tracker-configuration.c.old 2008-11-28 16:13:12.834485000 +0800
-+++ tracker-0.6.6/src/tracker-preferences/tracker-configuration.c 2008-11-28 16:16:54.715948000 +0800
-@@ -379,11 +379,10 @@
- "# Minimizes the use of memory but may slow indexing down\n",
- "LowMemoryMode=false\n\n",
- "# Set the initial sleeping time, in seconds\n",
-- "InitialSleep=60\n",
-+ "InitialSleep=45\n",
- "[Watches]\n",
- "# List of directory roots to index and watch seperated by semicolons\n",
-- "WatchDirectoryRoots=",
-- g_get_home_dir (), ";\n",
-+ "WatchDirectoryRoots=\n",
- "# List of directory roots to index but not watch (no live updates but are refreshed when trackerd is next restarted) seperated by semicolons\n",
- "CrawlDirectory=\n",
- "# List of directory roots to not index and not watch seperated by semicolons\n",
-@@ -410,7 +409,7 @@
- "Language=", language, "\n",
- "# Enables use of language-specific stemmer\n",
- "EnableStemmer=true\n", "[Emails]\n",
-- "IndexEvolutionEmails=true\n",
-+ "IndexEvolutionEmails=false\n",
- "IndexThunderbirdEmails=false\n",
- "[Performance]\n",
- "# Maximum size of text in bytes to index from a file's text contents\n",
-@@ -428,7 +427,10 @@
- "# Selects the desired ratio of used records to buckets to be used when optimizing index (should be a value between 0 and 4) \n",
- "BucketRatio=1\n",
- "# Alters how much padding is used to prevent index relocations. Higher values improve indexing speed but waste more disk space. Value should be in range (1..8)\n",
-- "Padding=2\n", NULL);
-+ "Padding=2\n",
-+ "# Sets stack size of trackerd threads in bytes. The default on Linux is 8Mb (0 will use the system default).\n",
-+ "ThreadStackSize=8388608\n",
-+ NULL);
+- watch_directory_roots[0] = g_get_home_dir ();
+-
+ /* General */
+ g_key_file_set_integer (key_file, GROUP_GENERAL, KEY_VERBOSITY, DEFAULT_VERBOSITY);
+ g_key_file_set_comment (key_file, GROUP_GENERAL, KEY_VERBOSITY,
+@@ -818,7 +817,7 @@
- g_file_set_contents (filename, contents, strlen (contents),
- NULL);
+ /* Watches */
+ g_key_file_set_string_list (key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS,
+- watch_directory_roots, 1);
++ watch_directory_roots, 0);
+ g_key_file_set_comment (key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS,
+ " List of directory roots to index and watch (separator=;)",
+ NULL);
+@@ -856,7 +855,7 @@
+ " Set to false to completely disable thumbnail generation",
+ NULL);
+ g_key_file_set_string_list (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES,
+- empty_string_list, 0);
++ disabled_modules_list, 1);
+ g_key_file_set_comment (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES,
+ " List of disabled modules (separator=;)\n"
+ " The modules that are indexed are kept in $prefix/lib/tracker/indexer-modules",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/tracker-17-upgrade.diff Mon Mar 09 13:15:35 2009 +0000
@@ -0,0 +1,49 @@
+diff -ur tracker-0.6.90-orig/src/libtracker-common/tracker-file-utils.c tracker-0.6.90/src/libtracker-common/tracker-file-utils.c
+--- tracker-0.6.90-orig/src/libtracker-common/tracker-file-utils.c 2009-02-24 13:33:44.919238000 +0800
++++ tracker-0.6.90/src/libtracker-common/tracker-file-utils.c 2009-02-24 13:35:28.945355000 +0800
+@@ -834,7 +834,6 @@
+ user_data_dir = g_getenv ("XDG_DATA_HOME");
+
+ /* Check the default XDG_DATA_HOME location */
+- g_message (" XDG_DATA_HOME is '%s'", user_data_dir);
+
+ if (user_data_dir && path_has_write_access_or_was_created (user_data_dir)) {
+ return TRUE;
+diff -ur tracker-0.6.90-orig/src/libtracker-common/tracker-hal.c tracker-0.6.90/src/libtracker-common/tracker-hal.c
+--- tracker-0.6.90-orig/src/libtracker-common/tracker-hal.c 2009-02-24 13:33:44.914250000 +0800
++++ tracker-0.6.90/src/libtracker-common/tracker-hal.c 2009-02-24 13:42:56.527044000 +0800
+@@ -589,8 +589,6 @@
+ return "LIBHAL_DRIVE_TYPE_JAZ";
+ case LIBHAL_DRIVE_TYPE_FLASHKEY:
+ return "LIBHAL_DRIVE_TYPE_FLASHKEY";
+- case LIBHAL_DRIVE_TYPE_MO:
+- return "LIBHAL_DRIVE_TYPE_MO";
+ default:
+ return "";
+ }
+diff -ur tracker-0.6.90-orig/src/tracker-indexer/Makefile.am tracker-0.6.90/src/tracker-indexer/Makefile.am
+--- tracker-0.6.90-orig/src/tracker-indexer/Makefile.am 2009-02-24 13:33:44.966292000 +0800
++++ tracker-0.6.90/src/tracker-indexer/Makefile.am 2009-02-24 13:35:56.192634000 +0800
+@@ -3,7 +3,7 @@
+ SUBDIRS = modules
+
+ INCLUDES = \
+- -Wall \
++ -w \
+ -DSHAREDIR=\""$(datadir)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
+ -DLOCALEDIR=\""$(localedir)"\" \
+diff -ur tracker-0.6.90-orig/src/tracker-extract/tracker-main.c tracker-0.6.90/src/tracker-extract/tracker-main.c
+--- tracker-0.6.90-orig/src/tracker-extract/tracker-main.c 2009-02-24 14:03:08.229199000 +0800
++++ tracker-0.6.90/src/tracker-extract/tracker-main.c 2009-02-24 14:04:00.153017000 +0800
+@@ -30,10 +30,6 @@
+ #include <glib-object.h>
+ #include <glib/gi18n.h>
+
+-#ifndef G_OS_WIN32
+-#include <sys/resource.h>
+-#endif
+-
+ #include <libtracker-common/tracker-os-dependant.h>
+ #include <libtracker-common/tracker-thumbnailer.h>
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/tracker-18-replace-odt2txt-with-o3read.diff Mon Mar 09 13:15:35 2009 +0000
@@ -0,0 +1,112 @@
+diff -ur tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.presentation-template_filter tracker-0.6.90/filters/application/vnd.oasis.opendocument.presentation-template_filter
+--- tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.presentation-template_filter 2009-03-04 17:23:20.162042000 +0800
++++ tracker-0.6.90/filters/application/vnd.oasis.opendocument.presentation-template_filter 2009-03-04 17:33:08.464041000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.presentation_filter tracker-0.6.90/filters/application/vnd.oasis.opendocument.presentation_filter
+--- tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.presentation_filter 2009-03-04 17:23:20.157329000 +0800
++++ tracker-0.6.90/filters/application/vnd.oasis.opendocument.presentation_filter 2009-03-04 17:33:01.127878000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter tracker-0.6.90/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter
+--- tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter 2009-03-04 17:23:20.161104000 +0800
++++ tracker-0.6.90/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter 2009-03-04 17:34:13.639905000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.spreadsheet_filter tracker-0.6.90/filters/application/vnd.oasis.opendocument.spreadsheet_filter
+--- tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.spreadsheet_filter 2009-03-04 17:23:20.161854000 +0800
++++ tracker-0.6.90/filters/application/vnd.oasis.opendocument.spreadsheet_filter 2009-03-04 17:34:27.647737000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.text-template_filter tracker-0.6.90/filters/application/vnd.oasis.opendocument.text-template_filter
+--- tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.text-template_filter 2009-03-04 17:23:20.157829000 +0800
++++ tracker-0.6.90/filters/application/vnd.oasis.opendocument.text-template_filter 2009-03-04 17:26:19.439909000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.text_filter tracker-0.6.90/filters/application/vnd.oasis.opendocument.text_filter
+--- tracker-0.6.90-orig/filters/application/vnd.oasis.opendocument.text_filter 2009-03-04 17:23:20.159874000 +0800
++++ tracker-0.6.90/filters/application/vnd.oasis.opendocument.text_filter 2009-03-04 17:24:34.271984000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.stardivision.writer_filter tracker-0.6.90/filters/application/vnd.stardivision.writer_filter
+--- tracker-0.6.90-orig/filters/application/vnd.stardivision.writer_filter 2009-03-04 17:23:20.161298000 +0800
++++ tracker-0.6.90/filters/application/vnd.stardivision.writer_filter 2009-03-04 17:35:09.791972000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.sun.xml.calc.template_filter tracker-0.6.90/filters/application/vnd.sun.xml.calc.template_filter
+--- tracker-0.6.90-orig/filters/application/vnd.sun.xml.calc.template_filter 2009-03-04 17:23:20.158224000 +0800
++++ tracker-0.6.90/filters/application/vnd.sun.xml.calc.template_filter 2009-03-04 17:35:34.527931000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.sun.xml.calc_filter tracker-0.6.90/filters/application/vnd.sun.xml.calc_filter
+--- tracker-0.6.90-orig/filters/application/vnd.sun.xml.calc_filter 2009-03-04 17:23:20.161494000 +0800
++++ tracker-0.6.90/filters/application/vnd.sun.xml.calc_filter 2009-03-04 17:35:50.639531000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.sun.xml.draw_filter tracker-0.6.90/filters/application/vnd.sun.xml.draw_filter
+--- tracker-0.6.90-orig/filters/application/vnd.sun.xml.draw_filter 2009-03-04 17:23:20.158990000 +0800
++++ tracker-0.6.90/filters/application/vnd.sun.xml.draw_filter 2009-03-04 17:36:08.615914000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.sun.xml.impress.template_filter tracker-0.6.90/filters/application/vnd.sun.xml.impress.template_filter
+--- tracker-0.6.90-orig/filters/application/vnd.sun.xml.impress.template_filter 2009-03-04 17:23:20.160042000 +0800
++++ tracker-0.6.90/filters/application/vnd.sun.xml.impress.template_filter 2009-03-04 17:36:49.127822000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.sun.xml.impress_filter tracker-0.6.90/filters/application/vnd.sun.xml.impress_filter
+--- tracker-0.6.90-orig/filters/application/vnd.sun.xml.impress_filter 2009-03-04 17:23:20.159352000 +0800
++++ tracker-0.6.90/filters/application/vnd.sun.xml.impress_filter 2009-03-04 17:37:04.711650000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.sun.xml.writer.template_filter tracker-0.6.90/filters/application/vnd.sun.xml.writer.template_filter
+--- tracker-0.6.90-orig/filters/application/vnd.sun.xml.writer.template_filter 2009-03-04 17:23:20.158809000 +0800
++++ tracker-0.6.90/filters/application/vnd.sun.xml.writer.template_filter 2009-03-04 17:37:25.695996000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt
+diff -ur tracker-0.6.90-orig/filters/application/vnd.sun.xml.writer_filter tracker-0.6.90/filters/application/vnd.sun.xml.writer_filter
+--- tracker-0.6.90-orig/filters/application/vnd.sun.xml.writer_filter 2009-03-04 17:23:20.157128000 +0800
++++ tracker-0.6.90/filters/application/vnd.sun.xml.writer_filter 2009-03-04 17:37:55.352063000 +0800
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-nice -n19 odt2txt "$1"
++nice -n19 unzip -p "$1" content.xml | o3totxt