From 58d8b4789cf6d1118b9a2fae1bc46bd108f99d26 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Tue, 27 Sep 2011 08:12:17 -0700 Subject: [PATCH] Use consistent version checking for tracker-sparql-0.12 Closes: bgo#660217 - folks-0.6.3.2 requires tracker-0.12, but configure.ac calls VALA_CHECK_PACKAGES([tracker-sparql-0.10]) --- NEWS | 2 ++ configure.ac | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 8a52835..c87e710 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ Overview of changes from libfolks 0.6.3.2 to libfolks 0.6.4 ============================================================= Bugs fixed: +* Bug 660217 — folks-0.6.3.2 requires tracker-0.12, but configure.ac calls + VALA_CHECK_PACKAGES([tracker-sparql-0.10]) Overview of changes from libfolks 0.6.3.1 to libfolks 0.6.3.2 ============================================================= diff --git a/configure.ac b/configure.ac index f9abdc5..879ca90 100644 --- a/configure.ac +++ b/configure.ac @@ -130,8 +130,8 @@ GLIB_REQUIRED=2.24.0 TP_GLIB_REQUIRED=0.13.1 VALA_REQUIRED=0.13.4 VALADOC_REQUIRED=0.3.1 -TRACKER_SPARQL_REQUIRED=0.12 -TRACKER_SPARQL_NEWER_VER=0.12.0 +TRACKER_SPARQL_MAJOR=0.12 +TRACKER_SPARQL_REQUIRED=0.12.0 GCONF2_REQUIRED=2.31 EBOOK_REQUIRED=3.1.5 EDATASERVER_REQUIRED=3.1.5 @@ -149,11 +149,9 @@ PKG_CHECK_MODULES([GEE], [gee-1.0 < 0.7]) PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib >= $TP_GLIB_REQUIRED]) if test x$enable_tracker_backend = xyes; then - # Starting Tracker 0.10.6, the GLib.SpawnError is exception is thrown - # when calling Tracker.Sparql.Connection.get (). So we need to test - # for the installed version and catch or not the exception, accordingly. PKG_CHECK_MODULES([TRACKER_SPARQL], - [tracker-sparql-0.12 >= $TRACKER_SPARQL_NEWER_VER]) + [tracker-sparql-$TRACKER_SPARQL_MAJOR >= \ + $TRACKER_SPARQL_REQUIRED]) fi if test x$enable_eds_backend = xyes; then @@ -234,7 +232,7 @@ if test "x$enable_vala" = "xyes" ; then gee-1.0]) if test x$enable_tracker_backend = xyes; then - VALA_CHECK_PACKAGES([tracker-sparql-0.10]) + VALA_CHECK_PACKAGES([tracker-sparql-$TRACKER_SPARQL_MAJOR]) fi if test x$enable_eds_backend = xyes; then -- 2.7.4