From dabbd75e83e2d696b1cccf11c21f521bbffae151 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 18 Sep 2007 23:35:30 +0000
Subject: [PATCH] fix tracker search

---
 gtk2.spec        |  7 ++++++-
 libtracker.patch | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 libtracker.patch

diff --git a/gtk2.spec b/gtk2.spec
index 348caf7..9bf5d64 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
 Patch2: workaround.patch
 # fixed in upstream svn
 Patch3: novalidate.patch
+Patch4: libtracker.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -119,6 +120,7 @@ docs for the GTK+ widget toolkit.
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .novalidate
+%patch4 -p1 -b .libtracker
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -301,6 +303,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-2
+- Adapt to tracker ABI changes
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-1
 - Update to 2.12.0
 
diff --git a/libtracker.patch b/libtracker.patch
new file mode 100644
index 0000000..f39cd3e
--- /dev/null
+++ b/libtracker.patch
@@ -0,0 +1,22 @@
+diff -up gtk+-2.12.0/gtk/gtksearchenginetracker.c.libtracker gtk+-2.12.0/gtk/gtksearchenginetracker.c
+--- gtk+-2.12.0/gtk/gtksearchenginetracker.c.libtracker	2007-09-18 19:29:57.000000000 -0400
++++ gtk+-2.12.0/gtk/gtksearchenginetracker.c	2007-09-18 19:30:54.000000000 -0400
+@@ -71,10 +71,16 @@ open_libtracker (void)
+     {
+       int i;
+       GModule *tracker;
++      GModuleFlags flags;
+       
+       done = TRUE;
+- 
+-      tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
++      flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
++
++      tracker = g_module_open ("libtrackerclient.so.0", flags);
++
++      if (!tracker)
++        tracker = g_module_open ("libtracker.so.0", flags);
++
+       if (!tracker)
+ 	return;
+