Hello community,

here is the log from the commit of package grilo-plugins for openSUSE:Factory
checked in at Wed Sep 14 14:02:37 CEST 2011.



--------
--- grilo-plugins/grilo-plugins.changes 2011-09-05 17:49:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/grilo-plugins/grilo-plugins.changes    
2011-09-13 09:54:32.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Sep 13 07:46:17 UTC 2011 - [email protected]
+
+- Fix build with tracker 0.12:
+  + Add grilo-plugins-tracker-0.12.patch: support build with
+    tracker 0.12.
+  + Change pkgconfig(tracker-sparql-0.11) BuildRequires to
+    pkgconfig(tracker-sparql-0.12).
+  + Add gnome-common BuildRequires and call to autoreconf, needed
+    for the patch.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  grilo-plugins-tracker-0.12.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ grilo-plugins.spec ++++++
--- /var/tmp/diff_new_pack.OCI87S/_old  2011-09-14 14:02:19.000000000 +0200
+++ /var/tmp/diff_new_pack.OCI87S/_new  2011-09-14 14:02:19.000000000 +0200
@@ -19,13 +19,17 @@
 
 Name:           grilo-plugins
 Version:        0.1.17
-Release:        1
+Release:        2
 # FIXME: The various plugins probably need to be split out in smaller 
packages. (see bnc#710364)
 License:        LGPL-2.1+
 Summary:        Media discovering and browsing framework -- Media and Metadata 
Plugins
 Url:            https://live.gnome.org/Grilo
 Group:          Productivity/Multimedia/Other
 Source:         
http://download.gnome.org/sources/grilo-plugins/0.1/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM grilo-plugins-tracker-0.12.patch [email protected] -- 
Support build with tracker 0.12, taken from git
+Patch0:         grilo-plugins-tracker-0.12.patch
+# needed for patch0
+BuildRequires:  gnome-common
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -43,7 +47,7 @@
 BuildRequires:  pkgconfig(sqlite3)
 %if 0%{?suse_version} > 1140
 BuildRequires:  pkgconfig(libquvi) >= 0.2.15
-BuildRequires:  pkgconfig(tracker-sparql-0.11)
+BuildRequires:  pkgconfig(tracker-sparql-0.12)
 %else
 BuildRequires:  pkgconfig(tracker-sparql-0.10)
 %endif
@@ -59,8 +63,11 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+# needed for patch0
+autoreconf -fi
 %configure --disable-static
 make %{?_smp_mflags}
 

++++++ grilo-plugins-tracker-0.12.patch ++++++
>From 43c1e5e7555de086e69e0944fd91b62903653aaa Mon Sep 17 00:00:00 2001
From: Juan A. Suarez Romero <[email protected]>
Date: Wed, 07 Sep 2011 17:21:15 +0000
Subject: tracker: Add support for Tracker 0.12

This fixes https://bugzilla.gnome.org/show_bug.cgi?id=658448

Signed-off-by: Juan A. Suarez Romero <[email protected]>
---
diff --git a/configure.ac b/configure.ac
index 13993e1..96e7c25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,11 +133,21 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6,
                                                    HAVE_GMIME=yes,
                                                    HAVE_GMIME=no)])
 
-PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11,
+PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12,
                                   HAVE_TRACKER_SPARQL=yes,
-                                  [PKG_CHECK_MODULES(TRACKER_SPARQL, 
tracker-sparql-0.10 >= 0.10.5,
-                                                                     
HAVE_TRACKER_SPARQL=yes,
-                                                                     
HAVE_TRACKER_SPARQL=no)])
+                                  HAVE_TRACKER_SPARQL=no)
+
+if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
+   PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11,
+                                     HAVE_TRACKER_SPARQL=yes,
+                                     HAVE_TRACKER_SPARQL=no)
+fi
+
+if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
+   PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.10 >= 0.10.5,
+                                     HAVE_TRACKER_SPARQL=yes,
+                                     HAVE_TRACKER_SPARQL=no)
+fi
 
 PKG_CHECK_MODULES(GLIB_2_26, glib-2.0 >= 2.26.0,
                              HAVE_GLIB_2_26=yes,
--
cgit v0.9.0.2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to