diff --git a/.gitignore b/.gitignore index 4e137b6..f677a83 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tracker-1.2.6.tar.xz +SOURCES/tracker-1.2.7.tar.xz diff --git a/.tracker.metadata b/.tracker.metadata index c15ce2b..9cbd43c 100644 --- a/.tracker.metadata +++ b/.tracker.metadata @@ -1 +1 @@ -2e4f60e7cc3e36e9e1d35b39afe3c9200197f114 SOURCES/tracker-1.2.6.tar.xz +f88cedafca451054d1e83e3a3018b69a35205364 SOURCES/tracker-1.2.7.tar.xz diff --git a/SOURCES/0001-Revert-functions-tracker-Fix-collate-order.patch b/SOURCES/0001-Revert-functions-tracker-Fix-collate-order.patch new file mode 100644 index 0000000..d10976e --- /dev/null +++ b/SOURCES/0001-Revert-functions-tracker-Fix-collate-order.patch @@ -0,0 +1,36 @@ +From e0159ada2697b3006a4e0aa0145bbc9db7c33936 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Mon, 27 Jun 2016 13:43:35 +0200 +Subject: [PATCH] Revert "functions-tracker: Fix collate order" + +This reverts commit 38764ae59415868bbe0acad1c923cde20f2879fa. +--- + tests/libtracker-data/functions/functions-tracker-1.out | 2 +- + tests/libtracker-data/functions/functions-tracker-2.out | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/libtracker-data/functions/functions-tracker-1.out b/tests/libtracker-data/functions/functions-tracker-1.out +index 8fc886dca89a..d8c248445257 100644 +--- a/tests/libtracker-data/functions/functions-tracker-1.out ++++ b/tests/libtracker-data/functions/functions-tracker-1.out +@@ -1,7 +1,7 @@ ++"Text" + "default" + "optional" + "optional for third" + "other" + "purposes" + "testing" +-"Text" +diff --git a/tests/libtracker-data/functions/functions-tracker-2.out b/tests/libtracker-data/functions/functions-tracker-2.out +index 80bddb590486..9045c233789d 100644 +--- a/tests/libtracker-data/functions/functions-tracker-2.out ++++ b/tests/libtracker-data/functions/functions-tracker-2.out +@@ -1,3 +1,3 @@ +-"title of a film" + "Title X" + "UnitTesting" ++"title of a film" +-- +2.5.5 + diff --git a/SPECS/tracker.spec b/SPECS/tracker.spec index 7526998..eef22b8 100644 --- a/SPECS/tracker.spec +++ b/SPECS/tracker.spec @@ -14,8 +14,8 @@ Summary: Desktop-neutral search tool and indexer Name: tracker -Version: 1.2.6 -Release: 3%{?dist} +Version: 1.2.7 +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://wiki.gnome.org/Projects/Tracker @@ -28,6 +28,9 @@ 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.redhat.com/show_bug.cgi?id=1349508 +Patch3: 0001-Revert-functions-tracker-Fix-collate-order.patch + BuildRequires: desktop-file-utils BuildRequires: firefox BuildRequires: giflib-devel @@ -168,6 +171,7 @@ This package contains the documentation for tracker %patch1 -p1 -b .onlyshowin %patch2 -p1 -b .rlimits +%patch3 -p1 -b .collate-order ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath @@ -310,6 +314,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Jun 27 2016 Debarshi Ray - 1.2.7-2 +- Revert an adjustment to the test suite to accommodate older sqlite +- Resolves: #1349508 + +* Fri Jun 24 2016 Debarshi Ray - 1.2.7-1 +- Update to 1.2.7 +- Resolves: #1349508 + +* Tue Apr 12 2016 Debarshi Ray - 1.2.6-5 +- Fix the previous changelog entry +- Resolves: #1132114 + +* Tue Apr 12 2016 Debarshi Ray - 1.2.6-4 +- Handle failure to get a TrackerSparqlConnection +- Resolves: #1132114 + * Tue May 12 2015 Matthias Clasen - 1.2.6-3 - Rebuild against new totem-pl-parser - Related: #1174534