amigadave pushed to tracker (f21). "Update to 1.2.6"

[notifications at fedoraproject.org]

>From f0d8673bf389dc64936802e2ae7d3de14e4f4d21 Mon Sep 17 00:00:00 2001
From: David King <amigadave at amigadave.com>
Date: Fri, 10 Apr 2015 14:49:06 +0100
Subject: Update to 1.2.6


diff --git a/0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch b/0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch
deleted file mode 100644
index 3b7de55..0000000
--- a/0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 59745984f91fa0c5e464c312c3a142fe3bd3b853 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir at gnome.org>
-Date: Tue, 13 Jan 2015 14:51:50 +0100
-Subject: [PATCH] libtracker-miner: Restrict the amount of data that is logged
- for errors
-
-SPARQL update strings can be very long if the entire text of a document
-is being stored. Dumping these huge strings to the log eats up disk
-space and makes them harder to follow.
-
-However, often, the occurence of such an error indicates a broken
-extractor. In those cases, knowing part of the SPARQL can help in
-identifying the file that triggered the error.
-
-Usually the "nie:plainTextContent" property is the last one in the
-string, so we truncate the error messages at the first occurance of
-this property to achieve the best of both worlds.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=735406
----
- src/libtracker-miner/tracker-decorator.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-miner/tracker-decorator.c b/src/libtracker-miner/tracker-decorator.c
-index b8978d8..781e4de 100644
---- a/src/libtracker-miner/tracker-decorator.c
-+++ b/src/libtracker-miner/tracker-decorator.c
-@@ -19,6 +19,8 @@
- 
- #include "config.h"
- 
-+#include <string.h>
-+
- #include "tracker-decorator.h"
- #include "tracker-decorator-internal.h"
- #include "tracker-priority-queue.h"
-@@ -365,9 +367,17 @@ decorator_commit_cb (GObject      *object,
- 			child_error = g_ptr_array_index (errors, i);
- 
- 			if (child_error) {
-+				gchar *msg, *p;
-+
-+				msg = g_strdup (g_ptr_array_index (sparql, i));
-+				p = strstr (msg, "nie:plainTextContent");
-+				if (p != NULL)
-+					*p = '\0';
-+
- 				g_warning ("Task %d, error: %s", i, child_error->message);
--				g_warning ("Sparql update was:\n%s\n",
--				           (gchar *) g_ptr_array_index (sparql, i));
-+				g_warning ("Sparql update was:\n%s\n", msg);
-+
-+				g_free (msg);
- 			}
- 		}
- 
--- 
-2.1.0
-
diff --git a/sources b/sources
index 50451a1..a8c2acb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9344f560567f606d219ebe3f41a7219c  tracker-1.2.5.tar.xz
+a12d389aaaaaac807b984c381f40fefd  tracker-1.2.6.tar.xz
diff --git a/tracker.spec b/tracker.spec
index bfc4421..1f103c9 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -13,8 +13,8 @@
 %endif
 
 Name:           tracker
-Version:        1.2.5
-Release:        2%{?dist}
+Version:        1.2.6
+Release:        1%{?dist}
 Summary:        Desktop-neutral search tool and indexer
 
 Group:          Applications/System
@@ -29,9 +29,6 @@ Patch1:         tracker-0.15-onlyshowin.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1133924
 Patch2:         0001-tracker-extract-Avoid-the-use-of-setrlimit-it-s-caus.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=735406
-Patch3:         0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  firefox
 BuildRequires:  giflib-devel
@@ -175,7 +172,6 @@ This package contains the documentation for tracker
 
 %patch1 -p1 -b .onlyshowin
 %patch2 -p1 -b .rlimits
-%patch3 -p1 -b .restrict-logs
 
 ## nuke unwanted rpaths, see also
 ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@@ -317,6 +313,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Apr 10 2015 David King <amigadave at amigadave.com> - 1.2.6-1
+- Update to 1.2.6
+
 * Tue Jan 13 2015 Debarshi Ray <rishi at fedoraproject.org> - 1.2.5-2
 - Backport upstream patch to restrict the amount of data that is logged for
   errors (GNOME #735406)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/tracker.git/commit/?h=f21&id=f0d8673bf389dc64936802e2ae7d3de14e4f4d21