Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update spec for tracker from vermillion gnome-2-22
authorjerrytan
Mon, 11 Aug 2008 07:35:57 +0000
branchgnome-2-22
changeset 12497 f4743e0d8120
parent 12496 ee08d8edcdbf
child 12498 fa0c0a26b0d9
update spec for tracker from vermillion
ChangeLog file | annotate | diff | comparison | revisions
base-specs/tracker.spec file | annotate | diff | comparison | revisions
patches/tracker-02-disable-autostart.diff file | annotate | diff | comparison | revisions
patches/tracker-03-man.diff file | annotate | diff | comparison | revisions
patches/tracker-08-enable-webhistory.diff file | annotate | diff | comparison | revisions
patches/tracker-09-avoid-thumbnailer-crash.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Mon Aug 11 01:57:55 2008 +0000
+++ b/ChangeLog	Mon Aug 11 07:35:57 2008 +0000
@@ -1,3 +1,12 @@
+2008-08-11  Jerry Tan <[email protected]>
+
+        * base-specs/tracker.spec
+        * patches/tracker-03-man.diff
+        * patches/tracker-02-disable-autostart.diff
+        * patches/tracker-09-avoid-thumbnailer-crash.diff 
+        * patches/tracker-08-enable-webhistory.diff
+        update spec for tracker from Vermillion
+
 2008-08-11  Dave Lin <[email protected]>
 
 	==== Nevada build 97 ====
--- a/base-specs/tracker.spec	Mon Aug 11 01:57:55 2008 +0000
+++ b/base-specs/tracker.spec	Mon Aug 11 07:35:57 2008 +0000
@@ -37,6 +37,9 @@
 Patch7:         %{name}-07-check-remote.diff
 # date:2008-04-10 owner:jerrytan type:branding
 Patch8:         %{name}-08-enable-webhistory.diff
+# date:2008-08-04 owner:jerrytan type:bug bugster:6731359
+Patch9:         tracker-09-avoid-thumbnailer-crash.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gmime-devel, poppler-devel, gettext
@@ -75,13 +78,16 @@
 %prep
 %setup -q
 %patch1 -p1
+%if %option_with_sun_branding
 %patch2 -p1
-%patch3 -p0
+%endif
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %ifos linux
@@ -139,7 +145,6 @@
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
-%{_bindir}/o3totxt
 %{_bindir}/tracker*
 %{_datadir}/tracker/
 %{_datadir}/pixmaps/tracker/
--- a/patches/tracker-02-disable-autostart.diff	Mon Aug 11 01:57:55 2008 +0000
+++ b/patches/tracker-02-disable-autostart.diff	Mon Aug 11 07:35:57 2008 +0000
@@ -21,3 +21,24 @@
  X-GNOME-Bugzilla-Version=@VERSION@
 -X-GNOME-Autostart-enabled=true
 +X-GNOME-Autostart-enabled=false
+--- tracker-0.6.6/src/trackerd/tracker-utils.c.old	2008-07-10 11:12:50.546281000 +0800
++++ tracker-0.6.6/src/trackerd/tracker-utils.c	2008-07-10 11:13:55.309240000 +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",
+
+#--- tracker-0.6.6/src/Makefile.am.old	2008-07-10 17:04:05.445021000 +0800
+#+++ tracker-0.6.6/src/Makefile.am	2008-07-10 17:05:51.123649000 +0800
+#@@ -18,5 +18,5 @@
+# trackerapplet_dir = tracker-applet
+# endif
+ 
+#-SUBDIRS = libstemmer xdgmime $(qdbm_dir) text-filters trackerd libtracker tracker-extract tracker-thumbnailer $(libtrackergtk_dir) $(tracker_gui_dir) $(trackerapplet_dir) $(tracker_preferences_dir)
+#+SUBDIRS = libstemmer xdgmime $(qdbm_dir) trackerd libtracker tracker-extract tracker-thumbnailer $(libtrackergtk_dir) $(tracker_gui_dir) $(trackerapplet_dir) $(tracker_preferences_dir)
+ 
--- a/patches/tracker-03-man.diff	Mon Aug 11 01:57:55 2008 +0000
+++ b/patches/tracker-03-man.diff	Mon Aug 11 07:35:57 2008 +0000
@@ -1,6 +1,464 @@
---- docs/trackerd.1	Tue Jan 22 15:27:24 2008
-+++ docs/trackerd.1.new	Tue Jan 22 15:27:04 2008
-@@ -100,6 +100,10 @@
+--- 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
+@@ -1,4 +1,6 @@
++'\" te
+ .TH tracker-applet 1 "November, 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
+ .SH NAME
+ tracker-applet \- The tracker tray-icon and on-click-search-entry
+@@ -19,3 +21,24 @@
+ .SH SEE ALSO
+ .BR tracker-search-tool (1),
+ .BR trackerd (1).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.TE
++.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
+@@ -1,4 +1,7 @@
++'\" te
++
+ .TH tracker-extract 1 "July 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
+ .SH NAME
+ tracker-extract \- extract metadata from file and display them.
+@@ -14,3 +17,23 @@
+ 
+ .SH SEE ALSO
+ .BR trackerd (1)
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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 @@
++'\" te
+ .TH tracker-files 1 "July 2007" GNU "User Commands"
++...\" ARC 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 @@
+ .SH SEE ALSO
+ .BR trackerd (1),
+ .BR tracker-services (7).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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 @@
++'\" te
+ .TH tracker-meta-folder 1 "July, 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
++
+ .SH NAME
+ tracker-meta-folder \- return list of files indexed by tracker for a folder
+ 
+@@ -13,3 +16,23 @@
+ 
+ .SH SEE ALSO
+ .BR trackerd(1).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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
+@@ -1,5 +1,8 @@
++'\" te
+ .TH tracker-preferences 1 "November, 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
++
+ .SH NAME
+ tracker-preferences \- Preferences editor for trackerd
+ 
+@@ -15,3 +18,23 @@
+ .SH SEE ALSO
+ .BR tracker-search-tool (1),
+ .BR trackerd (1).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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
+@@ -1,4 +1,6 @@
++'\" te
+ .TH tracker-query 1 "July 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
+ .SH NAME
+ tracker-query \- command line tool to query tracker database 
+@@ -34,3 +36,23 @@
+ .SH "SEE ALSO"
+ .BR trackerd (1),
+ .BR tracker-services (7).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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 @@
++'\" te
+ .TH tracker-search 1 "July 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
++
+ .SH NAME
+ tracker-search \- command line tool to search documents indexed by
+ trackerd
+@@ -37,3 +40,23 @@
+ .BR trackerd (1),
+ .BR tracker-search-tool (1),
+ .BR tracker-services (7).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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
+@@ -1,5 +1,8 @@
++'\" te
+ .TH tracker-search-tool 1 "July, 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
++
+ .SH NAME
+ tracker-search-tool \- Gnome Tracker Search Tool
+ 
+@@ -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).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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 @@
++'\" te
+ .TH tracker-services 7 "July 2007" GNU "Conventions"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
++
+ .SH NAME
+ tracker-services \- service types of trackerd
+ 
+@@ -58,3 +61,23 @@
+ .BR tracker-search-tool (1),
+ .BR tracker-query (1),
+ .BR tracker-files (1).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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
+@@ -1,5 +1,8 @@
++'\" te
+ .TH tracker-stats 1 "July 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
++
+ .SH NAME
+ tracker-stats\- command line tool that provides statistics on files
+ indexed by
+@@ -22,3 +25,23 @@
+ .BR trackerd (1),
+ .BR tracker-status (1),
+ .BR tracker-services (7).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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
+@@ -1,5 +1,8 @@
++'\" te
+ .TH tracker-status 1 "July 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
++
+ .SH NAME
+ tracker-status\- command line tool that reports the trackerd status
+ 
+@@ -15,3 +18,23 @@
+ .SH SEE ALSO
+ .BR trackerd (1),
+ .BR tracker-stats (1)
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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 @@
++'\" te
+ .TH tracker-tag 1 "July, 2007" GNU "User Commands"
++...\" ARC 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]>,
+ for the Debian project (but may be used by others).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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
+@@ -1,5 +1,8 @@
++'\" te
+ .TH tracker-thumbnailer 1 "July, 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
++
+ .SH NAME
+ tracker-thumbnailer \- create freedesktop.org compliant thumbnails
+ 
+@@ -46,3 +49,23 @@
+ .PP
+ This manual page was written by Michael Biebl <[email protected]>,
+ for the Debian project (but may be used by others).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.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
+@@ -1,4 +1,6 @@
++'\" te
+ .TH trackerd 1 "July 2007" GNU "User Commands"
++...\" ARC LSARC 2008/375 Meta Tracker
+ 
+ .SH NAME
+ trackerd \- indexer daemon for tracker search tool
+@@ -100,7 +102,12 @@
  needs a
  .BR dbus-daemon(1)
  to be running within your current session.
@@ -9,5 +467,31 @@
 +.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-meta-folder (1),
+ .BR tracker-files (1),
+ .BR tracker-services (7).
++
++.SH "ATTRIBUTES"
++.PP
++See \fBattributes\fR(5)
++for descriptions of the following attributes:
++.sp
++.TS
++tab(^G) box;
++cw(2.75i) |cw(2.75i)
++lw(2.75i) |lw(2.75i)
++.
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++_
++Availability^SUNWdesktop-search
++_
++Interface stability^Volatile
++
++.TE
++.sp
++
--- a/patches/tracker-08-enable-webhistory.diff	Mon Aug 11 01:57:55 2008 +0000
+++ b/patches/tracker-08-enable-webhistory.diff	Mon Aug 11 07:35:57 2008 +0000
@@ -11,3 +11,18 @@
  
  
  
+--- tracker-0.6.6/src/trackerd/tracker-db-sqlite.c.old	2008-07-10 16:42:13.077809000 +0800
++++ tracker-0.6.6/src/trackerd/tracker-db-sqlite.c	2008-07-10 16:42:28.633997000 +0800
+@@ -5858,12 +5858,6 @@
+ 		}		
+ 		tracker_db_free_result (res);
+ 		
+-		/* check for web history */
+-		if (!g_hash_table_lookup (tracker->service_table, "Webhistory")) {
+-			tracker_log ("Adding missing Webhistory service");
+-			tracker_exec_proc (db_con, "InsertServiceType", 1, "Webhistory");	
+-		}
+-		
+ 	}
+ 
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/tracker-09-avoid-thumbnailer-crash.diff	Mon Aug 11 07:35:57 2008 +0000
@@ -0,0 +1,11 @@
+--- tracker-0.6.6/src/tracker-thumbnailer/tracker-thumbnailer.c.old	2008-08-05 16:59:36.801175000 +0800
++++ tracker-0.6.6/src/tracker-thumbnailer/tracker-thumbnailer.c	2008-08-05 17:22:23.105174000 +0800
+@@ -102,6 +102,8 @@
+ 	int            num_palette;
+ 	png_bytepp     row_pointers;
+ 
++        p = NULL;
++
+ 	/* only make normal size thumbnails for now */
+ 	if (strcmp (argv[3], "normal") != 0) {
+ 		g_printerr ("Only normal sized thumbnails are supported\n");
sustaining/oi_151a/spec-files