libtelepathy: Prefer python 2.5

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

2 files changed, 16 insertions, 2 deletions

diff --git a/meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch b/meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch
new file mode 100644
index 0000000000..ec01567581
--- /dev/null
+++ b/meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch
@@ -0,0 +1,13 @@
+Index: libtelepathy-0.3.1/configure.ac
+===================================================================
+--- libtelepathy-0.3.1.orig/configure.ac        2007-11-22 19:05:56.000000000 +0000
++++ libtelepathy-0.3.1/configure.ac     2008-01-04 12:07:28.000000000 +0000
+@@ -51,7 +51,7 @@
+   AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
+ fi
+ 
+-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/libtelepathy_0.3.1.bb b/meta/packages/telepathy/libtelepathy_0.3.1.bb
index 898400fa72..b87a72ba67 100644
--- a/meta/packages/telepathy/libtelepathy_0.3.1.bb
+++ b/meta/packages/telepathy/libtelepathy_0.3.1.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Telepathy framework - GLib library"
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus telepathy-glib"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz"
+SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
+           file://prefer_python_2.5.patch;patch=1 "
 
 inherit autotools pkgconfig