From 11b87c5e56b57d4a590c24b4c04dbb78194ae463277b7da5f22f037ec4b25bd4 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 15:28:52 +0000 Subject: [PATCH 1/2] Accepting request 132854 from GNOME:Next Push G:N - had been reviewed with a small comment.. fixed OBS-URL: https://build.opensuse.org/request/show/132854 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/tracker?expand=0&rev=18 --- tracker-extras.changes | 6 ++++++ tracker-extras.spec | 2 +- tracker.changes | 6 ++++++ tracker.spec | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tracker-extras.changes b/tracker-extras.changes index d0b9666..a9b9a8c 100644 --- a/tracker-extras.changes +++ b/tracker-extras.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 20 08:53:17 UTC 2012 - dimstar@opensuse.org + +- Disable evo plugin for now during -extras build: the API once + more changed much faster than Tracker can keep up with. + ------------------------------------------------------------------- Tue Jul 10 13:05:56 UTC 2012 - coolo@suse.com diff --git a/tracker-extras.spec b/tracker-extras.spec index ddb3f1b..df10c77 100644 --- 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 diff --git a/tracker.changes b/tracker.changes index d0b9666..a9b9a8c 100644 --- a/tracker.changes +++ b/tracker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 20 08:53:17 UTC 2012 - dimstar@opensuse.org + +- Disable evo plugin for now during -extras build: the API once + more changed much faster than Tracker can keep up with. + ------------------------------------------------------------------- Tue Jul 10 13:05:56 UTC 2012 - coolo@suse.com diff --git a/tracker.spec b/tracker.spec index 971f28f..162d446 100644 --- 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 From 157f3692048d634c5354cefac157716623311cc25b80c3848ad3760cfddd0361 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 Sep 2012 19:27:01 +0000 Subject: [PATCH 2/2] Accepting request 134826 from home:Zaitor:branches:GNOME:Factory Add upstream fix taken from git, candidate for bnc#134707 for 12.2 OBS-URL: https://build.opensuse.org/request/show/134826 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/tracker?expand=0&rev=19 --- libtracker-fts-ICU-complx-locale.patch | 29 ++++++++++++++++++++++++++ tracker-extras.changes | 5 +++++ tracker-extras.spec | 3 +++ tracker.changes | 5 +++++ tracker.spec | 3 +++ 5 files changed, 45 insertions(+) create mode 100644 libtracker-fts-ICU-complx-locale.patch diff --git a/libtracker-fts-ICU-complx-locale.patch b/libtracker-fts-ICU-complx-locale.patch new file mode 100644 index 0000000..990c01b --- /dev/null +++ b/libtracker-fts-ICU-complx-locale.patch @@ -0,0 +1,29 @@ +From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 20 Jul 2012 14:46:33 +0000 +Subject: libtracker-fts: ICU cannot handle complex locale descriptions + +ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"), +not the full definition of your various locale variables and their +values as returned by glibc's setlocale(LC_ALL, NULL). + +Instead, limit ourselves to LC_CTYPE, since after all, that's all we +need to determine word boundaries. + +Fixes GB#675660. +--- +diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c +index 7388f69..69f75ed 100644 +--- a/src/libtracker-fts/tracker-parser-libicu.c ++++ b/src/libtracker-fts/tracker-parser-libicu.c +@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser, + + /* Open word-break iterator */ + parser->bi = ubrk_open(UBRK_WORD, +- setlocale (LC_ALL, NULL), ++ setlocale (LC_CTYPE, NULL), + parser->utxt, + parser->utxt_size, + &error); +-- +cgit v0.9.0.2 diff --git a/tracker-extras.changes b/tracker-extras.changes index a9b9a8c..24ca249 100644 --- a/tracker-extras.changes +++ b/tracker-extras.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 18 11:07:46 UTC 2012 - zaitor@opensuse.org + +- Add libtracker-fts-ICU-complx-locale.patch, fixes bnc#780614. + ------------------------------------------------------------------- Mon Aug 20 08:53:17 UTC 2012 - dimstar@opensuse.org diff --git a/tracker-extras.spec b/tracker-extras.spec index df10c77..ccfce83 100644 --- a/tracker-extras.spec +++ b/tracker-extras.spec @@ -66,6 +66,8 @@ Patch2: tracker-fix-include-sched-idle.patch Patch3: tracker-libgrss-0.5.patch # PATCH-FIX-UPSTREAM tracker-evo-implicit.patch bgo#675413 dimstar@opensuse.org -- Include email-backend.h; fixes brp checks. Patch4: tracker-evo-implicit.patch +# PATCH-FIX-UPSTREAM libtracker-fts-ICU-complx-locale.patch bnc#780614 bgo#675660 zaitor@opensuse.org -- libtracker-fts: ICU cannot handle complex locale descriptions, patch taken from upstream git. +Patch5: libtracker-fts-ICU-complx-locale.patch BuildRequires: NetworkManager-devel >= 0.8 BuildRequires: enca-devel BuildRequires: fdupes @@ -521,6 +523,7 @@ translation-update-upstream %endif %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{S:1} src/miners/flickr/README.SUSE cp %{S:2} src/miners/rss/README.SUSE diff --git a/tracker.changes b/tracker.changes index a9b9a8c..24ca249 100644 --- a/tracker.changes +++ b/tracker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 18 11:07:46 UTC 2012 - zaitor@opensuse.org + +- Add libtracker-fts-ICU-complx-locale.patch, fixes bnc#780614. + ------------------------------------------------------------------- Mon Aug 20 08:53:17 UTC 2012 - dimstar@opensuse.org diff --git a/tracker.spec b/tracker.spec index 162d446..0a73a20 100644 --- a/tracker.spec +++ b/tracker.spec @@ -65,6 +65,8 @@ Patch2: tracker-fix-include-sched-idle.patch Patch3: tracker-libgrss-0.5.patch # PATCH-FIX-UPSTREAM tracker-evo-implicit.patch bgo#675413 dimstar@opensuse.org -- Include email-backend.h; fixes brp checks. Patch4: tracker-evo-implicit.patch +# PATCH-FIX-UPSTREAM libtracker-fts-ICU-complx-locale.patch bnc#780614 bgo#675660 zaitor@opensuse.org -- libtracker-fts: ICU cannot handle complex locale descriptions, patch taken from upstream git. +Patch5: libtracker-fts-ICU-complx-locale.patch BuildRequires: NetworkManager-devel >= 0.8 BuildRequires: enca-devel BuildRequires: fdupes @@ -520,6 +522,7 @@ translation-update-upstream %endif %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{S:1} src/miners/flickr/README.SUSE cp %{S:2} src/miners/rss/README.SUSE