Accepting request 332967 from GNOME:Next

Update to 3.18.0

OBS-URL: https://build.opensuse.org/request/show/332967
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/tracker?expand=0&rev=83

tracker-1.5.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bfdddc8fccdb877b5e75d7e6f7f5e0e2a646986b4d14aaca20d48c7015fa79de
-size 4912264

tracker-1.6.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e2729627224f43f8cd99c18d027a3b984e049fe924a265a9b31857566c9e28a
+size 4929004

tracker-extras.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep 22 13:00:26 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 1.6.0:
+  + tracker-extract: Fix synchronization with tracker-miner-fs when
+    wait-for-miner-fs=TRUE.
+  + tracker-miner-fs: Fix crash during startup.
+  + tracker-extract: Fix builtin dummy module struct.
+  + Updated translations.
+- Drop tracker-fix-dummy_module.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Wed Sep  2 10:50:06 UTC 2015 - dimstar@opensuse.org
 

tracker-extras.spec

@@ -41,7 +41,7 @@
 # Do not edit this auto generated file! Edit tracker.spec.
 Name:           tracker-extras
 %define _name   tracker
-Version:        1.5.2
+Version:        1.6.0
 Release:        0
 %define TrackerAPI    1.0
 %define RPMTrackerAPI 1_0
@@ -49,13 +49,11 @@ Summary:        Powerful object database, tag/metadata database, search tool and
 License:        GPL-2.0+
 Group:          Productivity/Other
 Url:            http://projects.gnome.org/tracker/
-Source0:        http://download.gnome.org/sources/tracker/1.5/%{_name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/tracker/1.6/%{_name}-%{version}.tar.xz
 # Needed for patch0: we need to bootstrap
 Source2:        README.SUSE.rss
 # PATCH-FIX-UPSTREAM tracker-extract-private.patch bgo#725689 dimstar@opensuse.org -- Do not maintain LT versioning for private libs
 Patch0:         tracker-extract-private.patch
-# PATCH-FIX-UPSTREAM tracker-fix-dummy_module.patch bgo#754448 dimstar@opensuse.org -- Fix definition of the dummy_module
-Patch1:         tracker-fix-dummy_module.patch
 BuildRequires:  NetworkManager-devel >= 0.8
 BuildRequires:  enca-devel
 BuildRequires:  fdupes
@@ -471,7 +469,6 @@ This package contains an nautilus plugin to tag files with Tracker.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-%patch1 -p1
 translation-update-upstream
 cp %{S:2} src/miners/rss/README.SUSE
 

tracker-fix-dummy_module.patch

@@ -1,33 +0,0 @@
-From 60f6d1f6be5fb01c88babe246e06f620796ce319 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Wed, 2 Sep 2015 13:39:54 +0200
-Subject: [PATCH] libtracker-extract: fix dummy_module
-
-The ModuleInfo typedef contains 6 items, of which the last is 'optional' (predefined).
-
-TRUE as parameter for TrackerExtractShutdownFunc though is not a good idea: it's used as an
-integer and passed as a pointer to a function call.
-
-As there is no shudown function for the dummy module, just pass an additional NULL in there.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=754448
----
- src/libtracker-extract/tracker-module-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-extract/tracker-module-manager.c b/src/libtracker-extract/tracker-module-manager.c
-index dc03200..175c83e 100644
---- a/src/libtracker-extract/tracker-module-manager.c
-+++ b/src/libtracker-extract/tracker-module-manager.c
-@@ -46,7 +46,7 @@ static gboolean dummy_extract_func (TrackerExtractInfo *info);
- 
- static ModuleInfo dummy_module = {
- 	NULL, TRACKER_MODULE_MAIN_THREAD,
--	dummy_extract_func, NULL, TRUE
-+	dummy_extract_func, NULL, NULL, TRUE
- };
- 
- static GHashTable *modules = NULL;
--- 
-2.5.0
-

tracker.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep 22 13:00:26 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 1.6.0:
+  + tracker-extract: Fix synchronization with tracker-miner-fs when
+    wait-for-miner-fs=TRUE.
+  + tracker-miner-fs: Fix crash during startup.
+  + tracker-extract: Fix builtin dummy module struct.
+  + Updated translations.
+- Drop tracker-fix-dummy_module.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Wed Sep  2 10:50:06 UTC 2015 - dimstar@opensuse.org
 

tracker.spec

@@ -40,7 +40,7 @@
 
 Name:           tracker
 %define _name   tracker
-Version:        1.5.2
+Version:        1.6.0
 Release:        0
 %define TrackerAPI    1.0
 %define RPMTrackerAPI 1_0
@@ -48,13 +48,11 @@ Summary:        Powerful object database, tag/metadata database, search tool and
 License:        GPL-2.0+
 Group:          Productivity/Other
 Url:            http://projects.gnome.org/tracker/
-Source0:        http://download.gnome.org/sources/tracker/1.5/%{_name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/tracker/1.6/%{_name}-%{version}.tar.xz
 # Needed for patch0: we need to bootstrap
 Source2:        README.SUSE.rss
 # PATCH-FIX-UPSTREAM tracker-extract-private.patch bgo#725689 dimstar@opensuse.org -- Do not maintain LT versioning for private libs
 Patch0:         tracker-extract-private.patch
-# PATCH-FIX-UPSTREAM tracker-fix-dummy_module.patch bgo#754448 dimstar@opensuse.org -- Fix definition of the dummy_module
-Patch1:         tracker-fix-dummy_module.patch
 BuildRequires:  NetworkManager-devel >= 0.8
 BuildRequires:  enca-devel
 BuildRequires:  fdupes
@@ -470,7 +468,6 @@ This package contains an nautilus plugin to tag files with Tracker.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-%patch1 -p1
 translation-update-upstream
 cp %{S:2} src/miners/rss/README.SUSE