Accepting request 98951 from GNOME:Apps

Pushing G:A OBS-URL: https://build.opensuse.org/request/show/98951 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tracker?expand=0&rev=44
2012-01-06 10:46:55 +00:00 · 2012-01-06 10:46:55 +00:00 · a9f70c7b82
commit a9f70c7b82
parent 3d2a4ef507
7 changed files with 728 additions and 9 deletions
--- a/tracker-0.12.5.tar.bz2
+++ b/tracker-0.12.5.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97a285398316ecbd4f390c8b5aff5c8997d89977c8c0a2254017026d56c4b39b
-size 8337175
--- a/tracker-0.12.8.tar.xz
+++ b/tracker-0.12.8.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473
+size 5876100
--- a/tracker-extras.changes
+++ b/tracker-extras.changes
@ -1,3 +1,75 @@
+-------------------------------------------------------------------
+Fri Dec  2 01:11:48 UTC 2011 - dimstar@opensuse.org
+
+- Disable evo plugins for now: %define build_evo 0:
+  e-d-s had some major API changes on the camel store and tracker
+  needs to catch up on this again,
+
+-------------------------------------------------------------------
+Sat Nov 26 17:48:05 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 0.12.8:
+  + New feature: Added userguide miner
+  + libtracker-data: Ensure that fn:timezone-from-dateTime
+    returns an integer
+  + libtracker-extract:
+    - Do not leak GUnixFDList on errors getting metadata
+    - Call g_simple_async_result_complete*() for all error
+      conditions too getting metadata
+  + libtracker-miner: Avoid blocking other SPARQL buffers from
+    being able to process update arrays
+  + tracker-extract:
+    - Do not close FDs more than once for GIF, TIFF and TEXT
+      extractors
+    - Fixed possible leak TrackerExtractInfos
+  + tracker-extract-albumart: Fixed memory leak with Pixbuf loader
+  + tracker-extract-pdf:
+    - Fixed leak Poppler actions when reading TOC
+    - Fixed uninitialised read warnings in Valgrind
+  + tracker-needle:
+    - Require GTK+ 3.0 in glade file
+    - Now display and allow editing of tags in the tag view
+    - Now find tags as well as other results with search criteria
+  + Bugs fixed: nokia#285537, nokia#291569, nokia#292744,
+    nokia#290406, nokia#285426, nokia#290165, nokia#290480,
+    nokia#291088, nokia#290814, nokia#290249, nokia#289953,
+    nokia#289635, nokia#286656, nokia#286610, nokia#284591,
+    nokia#288530
+  + Updated translations.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+- Add tracker-g_thread.patch: Remove g_thread_init calls.
+
+-------------------------------------------------------------------
+Mon Nov  7 00:19:00 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 0.12.7:
+  + libtracker-miner:
+    - Use a cancellable per crawled directory
+    - Improve logging of sparql errors
+  + tracker-extract-gstreamer: Handle streams with no tags
+  + tracker-writeback: Apply writeback handlers sequentially on a
+    same file
+  + Updated tests.
+  + Bugs fixed: bgo#662364, nokia#287970, nokia#287972.
+  + Updated translations.
+- Changes from version 0.12.6:
+  + tracker-control:
+    - Fix crash when unable to get miner pause details
+    - Do not call g_object_unref on NULL in error case
+  + tracker-extract:
+    - Also complete cancelled tasks
+    - Fix uninitialized variable in albumart
+  + tracker-extract-text: Fix crash if unable to open file
+  + tracker-miner-fs: Fix uninitialized variable
+  + tracker-needle: Fix crash in result store
+  + tracker-preferences: Mark tooltips in tracker-preferences.ui
+    for translation
+  + Updated tests.
+  + Bugs fixed: bgo#662099, nokia#286589, nokia#287278.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Fri Oct 28 19:39:58 UTC 2011 - vuntz@opensuse.org

--- a/tracker-extras.spec
+++ b/tracker-extras.spec
@ -30,7 +30,7 @@
 %define build_thunderbird 0
 %else
 %define build_applet 1
-%define build_evo 1
+%define build_evo 0
 %define build_firefox 1
 %define build_gui 1
 %define build_miner_flickr 1
@ -50,20 +50,23 @@

 Name:           tracker-extras
 %define _name   tracker
-Version:        0.12.5
+Version:        0.12.8
 Release:        1
+# FIXME: Verify if the evolution plugin can be built again (define build_evo 1 in build_extras section)
 # FIXME: missing pkgconfig(libcue) BuildRequires: we don't have this packaged...
 License:        GPLv2+
 Summary:        Powerful object database, tag/metadata database, search tool and indexer
 Url:            http://projects.gnome.org/tracker/
 Group:          Productivity/Other
-Source0:        http://download.gnome.org/sources/tracker/0.12/%{_name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/tracker/0.12/%{_name}-%{version}.tar.xz
 Source1:        README.SUSE.flickr
 Source2:        README.SUSE.rss
 # PATCH-FIX-OPENSUSE tracker-removeable-media-off.patch bgo622288 badshah400@gmail.com -- Disable indexing on removable media by default. This is only needed for 11.4 and earlier, as 12.1 and later have proper default values in GSettings.
 Patch1:         tracker-removeable-media-off.patch
 # PATCH-FIX-OPENSUSE tracker-fix-include-sched-idle.patch malcolmlewis@opensuse.org -- Add linux/sched.h to includes for 11.4 only for the location of SCHED_IDLE. This is only needed for 11.4 and earlier.
 Patch2:         tracker-fix-include-sched-idle.patch
+# PATCH-FIX-UPSTREAM tracker-g_thread.patch dimstar@opensuse.org -- Remobe g_thread_init calls. Patch taken from upstream git.
+Patch3:         tracker-g_thread.patch
 BuildRequires:  NetworkManager-devel >= 0.8
 BuildRequires:  enca-devel
 BuildRequires:  fdupes
@ -86,6 +89,8 @@ BuildRequires:  sqlite3-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.12.0
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(gee-1.0)
 %if !%{build_extras}
@ -434,6 +439,7 @@ translation-update-upstream
 %patch1 -p1
 %patch2
 %endif
+%patch3 -p1
 cp %{S:1} src/miners/flickr/README.SUSE
 cp %{S:2} src/miners/rss/README.SUSE

--- a/tracker-g_thread.patch
+++ b/tracker-g_thread.patch
@ -0,0 +1,563 @@
+From 9295f5952a5d1a8ae8c461adef7e36caee01c676 Mon Sep 17 00:00:00 2001
+From: Jürg Billeter <j@bitron.ch>
+Date: Sun, 27 Nov 2011 14:10:21 +0000
+Subject: Remove g_thread_init calls
+
+Calling g_thread_init with GLib 2.31 requires explicit dependency on
+gthread-2.0. However, g_type_init initializes threads since GLib 2.24,
+so it is no longer needed.
+---
+Index: tracker-0.12.8/configure.ac
+===================================================================
+--- tracker-0.12.8.orig/configure.ac
+++ tracker-0.12.8/configure.ac
+@@ -246,7 +246,6 @@ PKG_CHECK_MODULES(LIBTRACKER_EXTRACT, [$
+ # Check requirements for libtracker-fts
+ LIBTRACKER_FTS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                          gio-unix-2.0 >= $GLIB_REQUIRED
+-                         gthread-2.0  >= $GLIB_REQUIRED
+                          sqlite3      >= $SQLITE_REQUIRED"
+ 
+ PKG_CHECK_MODULES(LIBTRACKER_FTS, [$LIBTRACKER_FTS_REQUIRED])
+@@ -267,7 +266,6 @@ PKG_CHECK_MODULES(LIBTRACKER_SPARQL, [$L
+ # Check requirements for tracker-control
+ TRACKER_CONTROL_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                           gio-unix-2.0 >= $GLIB_REQUIRED
+-                          gthread-2.0  >= $GLIB_REQUIRED
+                           uuid"
+ 
+ PKG_CHECK_MODULES(TRACKER_CONTROL, [$TRACKER_CONTROL_REQUIRED])
+@@ -275,7 +273,6 @@ PKG_CHECK_MODULES(TRACKER_CONTROL, [$TRA
+ # Check requirements for tracker-explorer
+ TRACKER_EXPLORER_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                            gio-unix-2.0 >= $GLIB_REQUIRED
+-                           gthread-2.0  >= $GLIB_REQUIRED
+                            gmodule-2.0  >= $GLIB_REQUIRED
+                            gtk+-3.0     >= $GTK_REQUIRED
+ 			   gee-1.0      >= $GEE_REQUIRED"
+@@ -294,7 +291,6 @@ PKG_CHECK_MODULES(TRACKER_RESDUMP, [$TRA
+ # Check requirements for tracker-store
+ TRACKER_STORE_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                         gio-unix-2.0 >= $GLIB_REQUIRED
+-                        gthread-2.0  >= $GLIB_REQUIRED
+                         gmodule-2.0  >= $GLIB_REQUIRED
+                         sqlite3      >= $SQLITE_REQUIRED"
+ 
+@@ -305,7 +301,6 @@ TRACKER_STORE_LIBS="$TRACKER_STORE_LIBS
+ # Check requirements for tracker-extract
+ TRACKER_EXTRACT_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                           gio-unix-2.0 >= $GLIB_REQUIRED
+-                          gthread-2.0  >= $GLIB_REQUIRED
+                           gmodule-2.0  >= $GLIB_REQUIRED"
+ 
+ PKG_CHECK_MODULES(TRACKER_EXTRACT, [$TRACKER_EXTRACT_REQUIRED])
+@@ -318,7 +313,6 @@ PKG_CHECK_MODULES(TRACKER_EXTRACT_MODULE
+ # Check requirements for tracker-writeback
+ TRACKER_WRITEBACK_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                             gio-unix-2.0 >= $GLIB_REQUIRED
+-                            gthread-2.0  >= $GLIB_REQUIRED
+                             gmodule-2.0  >= $GLIB_REQUIRED"
+ 
+ PKG_CHECK_MODULES(TRACKER_WRITEBACK, [$TRACKER_WRITEBACK_REQUIRED])
+@@ -326,7 +320,6 @@ PKG_CHECK_MODULES(TRACKER_WRITEBACK, [$T
+ # Check requirements for tracker-miner-fs
+ TRACKER_MINER_FS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                            gio-unix-2.0 >= $GLIB_REQUIRED
+-                           gthread-2.0  >= $GLIB_REQUIRED
+                            gmodule-2.0  >= $GLIB_REQUIRED"
+ 
+ PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TRACKER_MINER_FS_REQUIRED])
+@@ -429,15 +422,13 @@ TRACKER_MINER_FLICKR_LIBS="$TRACKER_MINE
+ 
+ # Check requirements for tracker-utils
+ TRACKER_UTILS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+-                        gio-unix-2.0 >= $GLIB_REQUIRED
+-                        gthread-2.0  >= $GLIB_REQUIRED"
+                        gio-unix-2.0 >= $GLIB_REQUIRED"
+ 
+ PKG_CHECK_MODULES(TRACKER_UTILS, [$TRACKER_UTILS_REQUIRED])
+ 
+ # Check requirements for tracker-needle
+ TRACKER_NEEDLE_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                          gio-unix-2.0 >= $GLIB_REQUIRED
+-                         gthread-2.0  >= $GLIB_REQUIRED
+                          gmodule-2.0  >= $GLIB_REQUIRED
+                          gtk+-3.0     >= $GTK_REQUIRED"
+ 
+@@ -448,7 +439,6 @@ PKG_CHECK_MODULES(TRACKER_NEEDLE, [$TRAC
+ # Check requirements for tracker-preferences
+ TRACKER_PREFERENCES_REQUIRED="glib-2.0       >= $GLIB_REQUIRED
+                               gio-unix-2.0   >= $GLIB_REQUIRED
+-                              gthread-2.0    >= $GLIB_REQUIRED
+                               gmodule-2.0    >= $GLIB_REQUIRED
+                               gtk+-3.0       >= $GTK_REQUIRED"
+ 
+@@ -459,7 +449,6 @@ PKG_CHECK_MODULES(TRACKER_PREFERENCES, [
+ # Check requirements for tracker-search-bar
+ TRACKER_SEARCH_BAR_REQUIRED="glib-2.0       >= $GLIB_REQUIRED
+                              gio-unix-2.0   >= $GLIB_REQUIRED
+-                             gthread-2.0    >= $GLIB_REQUIRED
+                              gmodule-2.0    >= $GLIB_REQUIRED
+                              gtk+-3.0       >= $GTK_REQUIRED
+                              gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED
+Index: tracker-0.12.8/examples/libtracker-miner/tracker-main.c
+===================================================================
+--- tracker-0.12.8.orig/examples/libtracker-miner/tracker-main.c
+++ tracker-0.12.8/examples/libtracker-miner/tracker-main.c
+@@ -195,10 +195,6 @@ main (int argc, char *argv[])
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	main_loop = g_main_loop_new (NULL, FALSE);
+ 
+ 	miner = tracker_miner_test_new ("test");
+Index: tracker-0.12.8/src/miners/fs/tracker-main.c
+===================================================================
+--- tracker-0.12.8.orig/src/miners/fs/tracker-main.c
+++ tracker-0.12.8/src/miners/fs/tracker-main.c
+@@ -696,10 +696,6 @@ main (gint argc, gchar *argv[])
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	setlocale (LC_ALL, "");
+ 
+ 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+Index: tracker-0.12.8/src/miners/rss/tracker-main.c
+===================================================================
+--- tracker-0.12.8.orig/src/miners/rss/tracker-main.c
+++ tracker-0.12.8/src/miners/rss/tracker-main.c
+@@ -61,7 +61,6 @@ main (int argc, char **argv)
+ 	const gchar *error_message;
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	setlocale (LC_ALL, "");
+ 
+Index: tracker-0.12.8/src/tracker-control/tracker-control.c
+===================================================================
+--- tracker-0.12.8.orig/src/tracker-control/tracker-control.c
+++ tracker-0.12.8/src/tracker-control/tracker-control.c
+@@ -68,10 +68,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	/* Translators: this messagge will apper immediately after the  */
+ 	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
+ 	context = g_option_context_new (_(" - Manage Tracker processes and data"));
+Index: tracker-0.12.8/src/tracker-utils/tracker-import.c
+===================================================================
+--- tracker-0.12.8.orig/src/tracker-utils/tracker-import.c
+++ tracker-0.12.8/src/tracker-utils/tracker-import.c
+@@ -104,10 +104,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	connection = tracker_sparql_connection_get (NULL, &error);
+ 
+ 	if (!connection) {
+Index: tracker-0.12.8/src/tracker-utils/tracker-info.c
+===================================================================
+--- tracker-0.12.8.orig/src/tracker-utils/tracker-info.c
+++ tracker-0.12.8/src/tracker-utils/tracker-info.c
+@@ -349,10 +349,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	connection = tracker_sparql_connection_get (NULL, &error);
+ 
+ 	if (!connection) {
+Index: tracker-0.12.8/src/tracker-utils/tracker-search.c
+===================================================================
+--- tracker-0.12.8.orig/src/tracker-utils/tracker-search.c
+++ tracker-0.12.8/src/tracker-utils/tracker-search.c
+@@ -1465,10 +1465,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 
+ #if HAVE_TRACKER_FTS
+ 	/* Only check stopwords if FTS is enabled */
+Index: tracker-0.12.8/src/tracker-utils/tracker-sparql.c
+===================================================================
+--- tracker-0.12.8.orig/src/tracker-utils/tracker-sparql.c
+++ tracker-0.12.8/src/tracker-utils/tracker-sparql.c
+@@ -280,10 +280,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	connection = tracker_sparql_connection_get (NULL, &error);
+ 
+ 	if (!connection) {
+Index: tracker-0.12.8/src/tracker-utils/tracker-stats.c
+===================================================================
+--- tracker-0.12.8.orig/src/tracker-utils/tracker-stats.c
+++ tracker-0.12.8/src/tracker-utils/tracker-stats.c
+@@ -81,10 +81,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	connection = tracker_sparql_connection_get (NULL, &error);
+ 
+ 	if (!connection) {
+Index: tracker-0.12.8/src/tracker-utils/tracker-tag.c
+===================================================================
+--- tracker-0.12.8.orig/src/tracker-utils/tracker-tag.c
+++ tracker-0.12.8/src/tracker-utils/tracker-tag.c
+@@ -933,10 +933,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	connection = tracker_sparql_connection_get (NULL, &error);
+ 
+ 	if (!connection) {
+Index: tracker-0.12.8/src/tracker-writeback/tracker-main.c
+===================================================================
+--- tracker-0.12.8.orig/src/tracker-writeback/tracker-main.c
+++ tracker-0.12.8/src/tracker-writeback/tracker-main.c
+@@ -85,8 +85,6 @@ main (int   argc,
+ 	gchar *log_filename;
+ 	guint shutdown_timeout;
+ 
+-	g_thread_init (NULL);
+-
+ 	g_type_init ();
+ 
+ 	/* Set up locale */
+Index: tracker-0.12.8/tests/gvdb/gvdb-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/gvdb/gvdb-test.c
+++ tracker-0.12.8/tests/gvdb/gvdb-test.c
+@@ -234,7 +234,6 @@ gint
+ main (gint argc, gchar **argv) 
+ {
+         g_type_init ();
+-        g_thread_init (NULL);
+ 
+         g_test_init (&argc, &argv, NULL);
+ 
+Index: tracker-0.12.8/tests/libtracker-common/tracker-dbus-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-common/tracker-dbus-test.c
+++ tracker-0.12.8/tests/libtracker-common/tracker-dbus-test.c
+@@ -289,7 +289,6 @@ main (int argc, char **argv) {
+ 	gint result;
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ /*
+Index: tracker-0.12.8/tests/libtracker-data/tracker-backup-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-data/tracker-backup-test.c
+++ tracker-0.12.8/tests/libtracker-data/tracker-backup-test.c
+@@ -219,10 +219,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	current_dir = g_get_current_dir ();
+Index: tracker-0.12.8/tests/libtracker-data/tracker-db-journal.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-data/tracker-db-journal.c
+++ tracker-0.12.8/tests/libtracker-data/tracker-db-journal.c
+@@ -366,7 +366,6 @@ main (int argc, char **argv)
+ 	int result;
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ #ifndef DISABLE_JOURNAL
+Index: tracker-0.12.8/tests/libtracker-data/tracker-ontology-change-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-data/tracker-ontology-change-test.c
+++ tracker-0.12.8/tests/libtracker-data/tracker-ontology-change-test.c
+@@ -314,10 +314,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	data_dir = g_build_filename (g_get_current_dir (), "test-cache", NULL);
+Index: tracker-0.12.8/tests/libtracker-data/tracker-ontology-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-data/tracker-ontology-test.c
+++ tracker-0.12.8/tests/libtracker-data/tracker-ontology-test.c
+@@ -278,10 +278,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	data_dir = g_build_filename (g_get_current_dir (), "test-cache", NULL);
+Index: tracker-0.12.8/tests/libtracker-data/tracker-sparql-blank-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-data/tracker-sparql-blank-test.c
+++ tracker-0.12.8/tests/libtracker-data/tracker-sparql-blank-test.c
+@@ -127,10 +127,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	current_dir = g_get_current_dir ();
+Index: tracker-0.12.8/tests/libtracker-data/tracker-sparql-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-data/tracker-sparql-test.c
+++ tracker-0.12.8/tests/libtracker-data/tracker-sparql-test.c
+@@ -326,10 +326,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	setlocale (LC_COLLATE, "en_US.utf8");
+Index: tracker-0.12.8/tests/libtracker-extract/tracker-test-xmp.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-extract/tracker-test-xmp.c
+++ tracker-0.12.8/tests/libtracker-extract/tracker-test-xmp.c
+@@ -598,7 +598,6 @@ main (int    argc,
+ 	gint result;
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	g_test_message ("Testing XMP");
+Index: tracker-0.12.8/tests/libtracker-fts/tracker-fts-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-fts/tracker-fts-test.c
+++ tracker-0.12.8/tests/libtracker-fts/tracker-fts-test.c
+@@ -183,10 +183,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+-
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	current_dir = g_get_current_dir ();
+Index: tracker-0.12.8/tests/libtracker-fts/tracker-parser-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-fts/tracker-parser-test.c
+++ tracker-0.12.8/tests/libtracker-fts/tracker-parser-test.c
+@@ -349,9 +349,6 @@ main (int argc, char **argv)
+ 	gint i;
+ 
+ 	g_type_init ();
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	/* We want the tests to properly find the stopwords dictionaries, so we
+Index: tracker-0.12.8/tests/libtracker-fts/tracker-parser.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-fts/tracker-parser.c
+++ tracker-0.12.8/tests/libtracker-fts/tracker-parser.c
+@@ -221,9 +221,6 @@ int
+ main (int argc, char **argv)
+ {
+ 	g_type_init ();
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+ 
+ 	/* Setup locale */
+ 	setlocale (LC_ALL, "");
+Index: tracker-0.12.8/tests/libtracker-miner/tracker-crawler-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-crawler-test.c
+++ tracker-0.12.8/tests/libtracker-miner/tracker-crawler-test.c
+@@ -320,7 +320,6 @@ main (int    argc,
+       char **argv)
+ {
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	g_test_message ("Testing filesystem crawler");
+Index: tracker-0.12.8/tests/libtracker-miner/tracker-miner-manager-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-miner-manager-test.c
+++ tracker-0.12.8/tests/libtracker-miner/tracker-miner-manager-test.c
+@@ -138,7 +138,6 @@ main (int    argc,
+         gint result;
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 	g_test_init (&argc, &argv, NULL);
+         
+ 	g_test_message ("Testing miner manager");
+Index: tracker-0.12.8/tests/libtracker-miner/tracker-monitor-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-monitor-test.c
+++ tracker-0.12.8/tests/libtracker-miner/tracker-monitor-test.c
+@@ -1874,7 +1874,6 @@ gint
+ main (gint    argc,
+       gchar **argv)
+ {
+-	g_thread_init (NULL);
+ 	g_type_init ();
+ 	g_test_init (&argc, &argv, NULL);
+ 
+Index: tracker-0.12.8/tests/libtracker-miner/tracker-password-provider-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-password-provider-test.c
+++ tracker-0.12.8/tests/libtracker-miner/tracker-password-provider-test.c
+@@ -106,7 +106,6 @@ main (int argc, char **argv)
+ 
+ 	g_type_init ();
+ 
+-	g_thread_init (NULL);
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	/* Set test environment up */
+Index: tracker-0.12.8/tests/libtracker-miner/tracker-priority-queue-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-priority-queue-test.c
+++ tracker-0.12.8/tests/libtracker-miner/tracker-priority-queue-test.c
+@@ -226,7 +226,6 @@ main (int    argc,
+       char **argv)
+ {
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	g_test_add_func ("/libtracker-miner/tracker-priority-queue/emptiness",
+Index: tracker-0.12.8/tests/libtracker-miner/tracker-task-pool-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-task-pool-test.c
+++ tracker-0.12.8/tests/libtracker-miner/tracker-task-pool-test.c
+@@ -161,7 +161,6 @@ gint
+ main (gint argc, gchar **argv)
+ {
+         g_type_init ();
+-        g_thread_init (NULL);
+         g_test_init (&argc, &argv, NULL);
+ 
+         g_test_add_func ("/libtracker-miner/tracker-task-pool/limit_set",
+Index: tracker-0.12.8/tests/libtracker-miner/tracker-thumbnailer-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-thumbnailer-test.c
+++ tracker-0.12.8/tests/libtracker-miner/tracker-thumbnailer-test.c
+@@ -133,7 +133,6 @@ main (int    argc,
+       char **argv)
+ {
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 	g_test_init (&argc, &argv, NULL);
+ 
+ 	g_test_message ("Testing thumbnailer");
+Index: tracker-0.12.8/tests/libtracker-sparql/tracker-test.c
+===================================================================
+--- tracker-0.12.8.orig/tests/libtracker-sparql/tracker-test.c
+++ tracker-0.12.8/tests/libtracker-sparql/tracker-test.c
+@@ -357,7 +357,6 @@ main (gint argc, gchar **argv)
+ {
+ 	int result;
+ 
+-	g_thread_init (NULL);
+ 	g_type_init ();
+ 	g_test_init (&argc, &argv, NULL);
+ 
+Index: tracker-0.12.8/utils/mtp/mtp-dummy.c
+===================================================================
+--- tracker-0.12.8.orig/utils/mtp/mtp-dummy.c
+++ tracker-0.12.8/utils/mtp/mtp-dummy.c
+@@ -530,7 +530,6 @@ check_duplicates (void)
+ int main (int argc, char **argv)
+ {
+ 	/* Initialize stuff */
+-	g_thread_init (NULL);
+ 	g_type_init ();
+ 
+ 	/* Initialize locale support! */
+Index: tracker-0.12.8/utils/tracker-sql/tracker-sql.c
+===================================================================
+--- tracker-0.12.8.orig/utils/tracker-sql/tracker-sql.c
+++ tracker-0.12.8/utils/tracker-sql/tracker-sql.c
+@@ -92,9 +92,6 @@ main (int argc, char **argv)
+ 	g_option_context_free (context);
+ 
+ 	g_type_init ();
+-	if (!g_thread_supported ()) {
+-		g_thread_init (NULL);
+-	}
+ 
+ 	if (file) {
+ 		gchar *path_in_utf8;
+Index: tracker-0.12.8/src/miners/flickr/tracker-miner-flickr.c
+===================================================================
+--- tracker-0.12.8.orig/src/miners/flickr/tracker-miner-flickr.c
+++ tracker-0.12.8/src/miners/flickr/tracker-miner-flickr.c
+@@ -6648,8 +6648,6 @@ gint tracker_miner_flickr_main (gchar**
+ 
+ int main (int argc, char ** argv) {
+ #line 950 "/home/martyn/Source/tracker/src/miners/flickr/tracker-miner-flickr.vala"
+-	g_thread_init (NULL);
+-#line 950 "/home/martyn/Source/tracker/src/miners/flickr/tracker-miner-flickr.vala"
+ 	g_type_init ();
+ #line 950 "/home/martyn/Source/tracker/src/miners/flickr/tracker-miner-flickr.vala"
+ 	return tracker_miner_flickr_main (argv, argc);
--- a/tracker.changes
+++ b/tracker.changes
@ -1,3 +1,75 @@
+-------------------------------------------------------------------
+Fri Dec  2 01:11:48 UTC 2011 - dimstar@opensuse.org
+
+- Disable evo plugins for now: %define build_evo 0:
+  e-d-s had some major API changes on the camel store and tracker
+  needs to catch up on this again,
+
+-------------------------------------------------------------------
+Sat Nov 26 17:48:05 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 0.12.8:
+  + New feature: Added userguide miner
+  + libtracker-data: Ensure that fn:timezone-from-dateTime
+    returns an integer
+  + libtracker-extract:
+    - Do not leak GUnixFDList on errors getting metadata
+    - Call g_simple_async_result_complete*() for all error
+      conditions too getting metadata
+  + libtracker-miner: Avoid blocking other SPARQL buffers from
+    being able to process update arrays
+  + tracker-extract:
+    - Do not close FDs more than once for GIF, TIFF and TEXT
+      extractors
+    - Fixed possible leak TrackerExtractInfos
+  + tracker-extract-albumart: Fixed memory leak with Pixbuf loader
+  + tracker-extract-pdf:
+    - Fixed leak Poppler actions when reading TOC
+    - Fixed uninitialised read warnings in Valgrind
+  + tracker-needle:
+    - Require GTK+ 3.0 in glade file
+    - Now display and allow editing of tags in the tag view
+    - Now find tags as well as other results with search criteria
+  + Bugs fixed: nokia#285537, nokia#291569, nokia#292744,
+    nokia#290406, nokia#285426, nokia#290165, nokia#290480,
+    nokia#291088, nokia#290814, nokia#290249, nokia#289953,
+    nokia#289635, nokia#286656, nokia#286610, nokia#284591,
+    nokia#288530
+  + Updated translations.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+- Add tracker-g_thread.patch: Remove g_thread_init calls.
+
+-------------------------------------------------------------------
+Mon Nov  7 00:19:00 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 0.12.7:
+  + libtracker-miner:
+    - Use a cancellable per crawled directory
+    - Improve logging of sparql errors
+  + tracker-extract-gstreamer: Handle streams with no tags
+  + tracker-writeback: Apply writeback handlers sequentially on a
+    same file
+  + Updated tests.
+  + Bugs fixed: bgo#662364, nokia#287970, nokia#287972.
+  + Updated translations.
+- Changes from version 0.12.6:
+  + tracker-control:
+    - Fix crash when unable to get miner pause details
+    - Do not call g_object_unref on NULL in error case
+  + tracker-extract:
+    - Also complete cancelled tasks
+    - Fix uninitialized variable in albumart
+  + tracker-extract-text: Fix crash if unable to open file
+  + tracker-miner-fs: Fix uninitialized variable
+  + tracker-needle: Fix crash in result store
+  + tracker-preferences: Mark tooltips in tracker-preferences.ui
+    for translation
+  + Updated tests.
+  + Bugs fixed: bgo#662099, nokia#286589, nokia#287278.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Fri Oct 28 19:39:58 UTC 2011 - vuntz@opensuse.org

--- a/tracker.spec
+++ b/tracker.spec
@ -30,7 +30,7 @@
 %define build_thunderbird 0
 %else
 %define build_applet 1
-%define build_evo 1
+%define build_evo 0
 %define build_firefox 1
 %define build_gui 1
 %define build_miner_flickr 1
@ -48,20 +48,23 @@

 Name:           tracker
 %define _name   tracker
-Version:        0.12.5
+Version:        0.12.8
 Release:        1
+# FIXME: Verify if the evolution plugin can be built again (define build_evo 1 in build_extras section)
 # FIXME: missing pkgconfig(libcue) BuildRequires: we don't have this packaged...
 License:        GPLv2+
 Summary:        Powerful object database, tag/metadata database, search tool and indexer
 Url:            http://projects.gnome.org/tracker/
 Group:          Productivity/Other
-Source0:        http://download.gnome.org/sources/tracker/0.12/%{_name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/tracker/0.12/%{_name}-%{version}.tar.xz
 Source1:        README.SUSE.flickr
 Source2:        README.SUSE.rss
 # PATCH-FIX-OPENSUSE tracker-removeable-media-off.patch bgo622288 badshah400@gmail.com -- Disable indexing on removable media by default. This is only needed for 11.4 and earlier, as 12.1 and later have proper default values in GSettings.
 Patch1:         tracker-removeable-media-off.patch
 # PATCH-FIX-OPENSUSE tracker-fix-include-sched-idle.patch malcolmlewis@opensuse.org -- Add linux/sched.h to includes for 11.4 only for the location of SCHED_IDLE. This is only needed for 11.4 and earlier.
 Patch2:         tracker-fix-include-sched-idle.patch
+# PATCH-FIX-UPSTREAM tracker-g_thread.patch dimstar@opensuse.org -- Remobe g_thread_init calls. Patch taken from upstream git.
+Patch3:         tracker-g_thread.patch
 BuildRequires:  NetworkManager-devel >= 0.8
 BuildRequires:  enca-devel
 BuildRequires:  fdupes
@ -84,6 +87,8 @@ BuildRequires:  sqlite3-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.12.0
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(gee-1.0)
 %if !%{build_extras}
@ -432,6 +437,7 @@ translation-update-upstream
 %patch1 -p1
 %patch2
 %endif
+%patch3 -p1
 cp %{S:1} src/miners/flickr/README.SUSE
 cp %{S:2} src/miners/rss/README.SUSE