libtelepathy: Fix double referenced file causing autoconf/automake issues

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/telepathy/libtelepathy/doublefix.patch b/meta/packages/telepathy/libtelepathy/doublefix.patch
new file mode 100644 (file)
index 0000000..5ff1c43
--- /dev/null
+++ b/meta/packages/telepathy/libtelepathy/doublefix.patch
@@ -0,0 +1,16 @@
+Fix double reference to this file to work with recent autoconf+automake
+
+RP 1/2/10
+
+Index: libtelepathy-0.3.3/src/Makefile.am
+===================================================================
+--- libtelepathy-0.3.3.orig/src/Makefile.am    2010-02-01 13:13:50.869038984 +0000
++++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000
+@@ -27,7 +27,6 @@
+     tp-chan-type-text-gen.h \
+     tp-chan-type-tubes-gen.h \
+     tp-conn-iface-aliasing-gen.h \
+-    tp-conn-iface-avatars-gen.h \
+     tp-conn-iface-capabilities-gen.h \
+     tp-conn-iface-contact-info-gen.h \
+     tp-conn-iface-forwarding-gen.h \

diff --git a/meta/packages/telepathy/libtelepathy_0.3.3.bb b/meta/packages/telepathy/libtelepathy_0.3.3.bb
index 1c9bf2a7141ed3fa955b32dd2c1178cd69b2ec9b..69e34a9f420d61e414ccc22722703109c808095e 100644 (file)
--- a/meta/packages/telepathy/libtelepathy_0.3.3.bb
+++ b/meta/packages/telepathy/libtelepathy_0.3.3.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "Telepathy framework - GLib library"
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib"
 LICENSE = "LGPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
-           file://prefer_python_2.5.patch;patch=1 "
+           file://prefer_python_2.5.patch;patch=1 \
+           file://doublefix.patch;patch=1"
 
 inherit autotools_stage pkgconfig