summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-04 11:49:28 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-04 11:49:28 +0000
commit7b7f440346485307be1ce567119cf9c9aabde221 (patch)
tree76dd7a22632aa9b5d89a5f38bbeb5b9f36dd10ec
parentf15684602a526f179f74e5fc3140c1fbbee29184 (diff)
downloadpoky-7b7f440346485307be1ce567119cf9c9aabde221.tar.gz
libtelepathy: Prefer python 2.5
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3406 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch13
-rw-r--r--meta/packages/telepathy/libtelepathy_0.3.1.bb5
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 @@
1Index: libtelepathy-0.3.1/configure.ac
2===================================================================
3--- libtelepathy-0.3.1.orig/configure.ac 2007-11-22 19:05:56.000000000 +0000
4+++ libtelepathy-0.3.1/configure.ac 2008-01-04 12:07:28.000000000 +0000
5@@ -51,7 +51,7 @@
6 AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
7 fi
8
9-AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python])
10+AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python])
11 if test -z "$PYTHON"; then
12 AC_MSG_ERROR([Python is required to compile this package])
13 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"
2HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" 2HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
3DEPENDS = "glib-2.0 dbus telepathy-glib" 3DEPENDS = "glib-2.0 dbus telepathy-glib"
4LICENSE = "LGPL" 4LICENSE = "LGPL"
5PR = "r1" 5PR = "r2"
6 6
7SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz" 7SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
8 file://prefer_python_2.5.patch;patch=1 "
8 9
9inherit autotools pkgconfig 10inherit autotools pkgconfig
10 11