rpms/gtk2/devel libtracker.patch,NONE,1.1 gtk2.spec,1.256,1.257

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25542

Modified Files:
	gtk2.spec 
Added Files:
	libtracker.patch 
Log Message:
fix tracker search


libtracker.patch:

--- NEW FILE libtracker.patch ---
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;
       


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- gtk2.spec	14 Sep 2007 05:16:37 -0000	1.256
+++ gtk2.spec	18 Sep 2007 23:35:30 -0000	1.257
@@ -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 @@
 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 @@
 %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 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-2
+- Adapt to tracker ABI changes
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
 - Update to 2.12.0