telepathy-python: avoid duplicated installation of errors.py

telepathy-python install fails on latest Fedora 16 due to the tighter
check of duplicated file installation.

Remove one errors.py entry in Makefile.am to fix this issue.

[YOCTO #1453]

(From OE-Core rev: d84fd7c1e90f080ea0c702cba9a9f81a2c465ee6)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu 2011-09-07 16:18:06 +08:00 committed by Richard Purdie
parent 4669760ac1
commit 84760050ab
2 changed files with 29 additions and 2 deletions

View File

@ -0,0 +1,26 @@
commit f6c67662145de889055a86a6b3b12c70a45fc8d5
Author: Dongxiao Xu <dongxiao.xu@intel.com>
Date: Wed Sep 7 16:02:20 2011 +0800
Avoid duplicated installation of errors.py
newer version of autotools don't seem to like listing files to install
twice. Remove one errors.py from the installation list.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Upstream-Status: Inappropirate [upstream inactive]
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c27dfe..7536e43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ telepathy_PYTHON = \
# telepathy._generated.* auto-generated modules
spec_dir = $(top_srcdir)/spec
-spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml))
+spec_files := $(filter-out _generated/errors.py, $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)))
BUILT_SOURCES = \
_generated/interfaces.py \

View File

@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
RDEPENDS_${PN} += "python-dbus"
SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
file://parallel_make.patch"
file://parallel_make.patch \
file://remove_duplicate_install.patch"
PR = "r2"
PR = "r3"
inherit autotools