Accepting request 62163 from home:vuntz:branches:GNOME:Factory

Looks good... now we need to hope this get's into 11.4... and we need tracker 0.10 :)

OBS-URL: https://build.opensuse.org/request/show/62163
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=125
This commit is contained in:
Dominique Leuenberger 2011-02-19 20:58:08 +00:00 committed by Git OBS Bridge
parent 2f16ef1a87
commit 94b81151cb
3 changed files with 33 additions and 2 deletions

View File

@ -0,0 +1,22 @@
Index: nautilus-2.32.2/libnautilus-private/nautilus-search-engine-tracker.c
===================================================================
--- nautilus-2.32.2.orig/libnautilus-private/nautilus-search-engine-tracker.c
+++ nautilus-2.32.2/libnautilus-private/nautilus-search-engine-tracker.c
@@ -122,10 +122,16 @@ open_libtracker (void)
done = TRUE;
flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
- tracker = g_module_open ("libtracker-client-0.8.so.0", flags);
+ tracker = g_module_open ("libtracker-client-0.10.so.0", flags);
+ /* we use the same API as in 0.8 */
version = TRACKER_0_8;
if (!tracker) {
+ tracker = g_module_open ("libtracker-client-0.8.so.0", flags);
+ version = TRACKER_0_8;
+ }
+
+ if (!tracker) {
tracker = g_module_open ("libtracker-client-0.7.so.0", flags);
if (tracker && !g_module_symbol (tracker, "tracker_resources_sparql_query_async", &x)) {

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Feb 19 18:13:23 CET 2011 - vuntz@opensuse.org
- Add nautilus-tracker-0.10.patch: add support for tracker 0.10.
Without it, a search will be very expensive.
-------------------------------------------------------------------
Sun Feb 13 16:54:03 CET 2011 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package nautilus (Version 2.32.2.1)
# spec file for package nautilus
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -23,7 +23,7 @@ Name: nautilus
License: GPLv2+
Group: Productivity/File utilities
Version: 2.32.2.1
Release: 1
Release: 2
# FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in
Summary: File Manager for the GNOME Desktop
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
@ -46,6 +46,8 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff
Patch21: nautilus-sysadmin-desktop-items.diff
# PATCH-FIX-UPSTREAM nautilus-boot-order.patch bgo#619841 sshaw@decriptor.com -- From SLED w/o sreadahead. Delays applets
Patch22: nautilus-boot-order.patch
# PATCH-FIX-UPSTREAM nautilus-tracker-0.10.patch bgo#642770 vuntz@opensuse.org -- Fix tracker search backend: the 0.10 tracker-client library has a different soname
Patch23: nautilus-tracker-0.10.patch
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-icon-theme
@ -121,6 +123,7 @@ gnome-patch-translation-prepare
%patch20 -p1
#%patch21 -p1
%patch22 -p1
%patch23 -p1
gnome-patch-translation-update
%build