telepathy-glib: Prefer python 2.5 over 2.4 over 2.3, not the other way around

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3403 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 16 insertions, 2 deletions

diff --git a/meta/packages/telepathy/telepathy-glib/prefer_python_2.5.patch b/meta/packages/telepathy/telepathy-glib/prefer_python_2.5.patch
new file mode 100644
index 0000000000..95b4f54582
--- /dev/null
+++ b/meta/packages/telepathy/telepathy-glib/prefer_python_2.5.patch
@@ -0,0 +1,13 @@
+Index: telepathy-glib-0.7.0/configure.ac
+===================================================================
+--- telepathy-glib-0.7.0.orig/configure.ac      2007-11-22 18:09:07.000000000 +0000
++++ telepathy-glib-0.7.0/configure.ac   2007-12-31 23:07:04.000000000 +0000
+@@ -179,7 +179,7 @@
+   AC_MSG_ERROR([dbus-binding-tool (from dbus-glib) is required])
+ fi
+ PYTHON=
+-AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python])
++AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python])
+ if test -z "$PYTHON"; then
+   AC_MSG_ERROR([Python is required to compile this package])
+ fi
diff --git a/meta/packages/telepathy/telepathy-glib_0.7.0.bb b/meta/packages/telepathy/telepathy-glib_0.7.0.bb
index 409a9e2770..884d0e1353 100644
--- a/meta/packages/telepathy/telepathy-glib_0.7.0.bb
+++ b/meta/packages/telepathy/telepathy-glib_0.7.0.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection man
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz "
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz \
+           file://prefer_python_2.5.patch;patch=1 "
 
 inherit autotools pkgconfig