Hello community, here is the log from the commit of package python-telepathy for openSUSE:Factory checked in at Wed Dec 29 00:31:11 CET 2010. -------- --- python-telepathy/python-telepathy.changes 2010-12-07 11:37:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-telepathy/python-telepathy.changes 2010-12-28 01:38:14.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Dec 28 00:30:57 UTC 2010 - dimstar@opensuse.org + +- Add python-telepathy-no_double_errors-py.patch: no not try to + install error.py twice. Patch from taken from git. +- Remove Makefile* from the examples folder after installing: the + entire examples folder is added as doc and we don't need this + bloat. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- python-telepathy-no_double_errors-py.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-telepathy.spec ++++++ --- /var/tmp/diff_new_pack.uX10SR/_old 2010-12-29 00:30:47.000000000 +0100 +++ /var/tmp/diff_new_pack.uX10SR/_new 2010-12-29 00:30:47.000000000 +0100 @@ -20,12 +20,14 @@ Name: python-telepathy %define _name telepathy-python Version: 0.15.19 -Release: 1 +Release: 2 License: LGPLv2.1+ Summary: Python library for Telepathy Url: http://telepathy.freedesktop.org/wiki/Telepathy%20Python Group: Development/Libraries/Python Source0: %{_name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM python-telepathy-no_double_errors-py.patch fdo#32526 dimstar@opensuse.org -- Do no install error.py twice. Patch from upstream git, commit 8c4e6e. +Patch0: python-telepathy-no_double_errors-py.patch BuildRequires: fdupes BuildRequires: libxslt BuildRequires: python @@ -48,12 +50,15 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build %configure %install %makeinstall +# We add examples/ as doc, so we don't want Makefiles in there. +rm examples/Makefile* %fdupes %{buildroot}/%{python_sitelib} %clean ++++++ python-telepathy-no_double_errors-py.patch ++++++ diff --git a/src/Makefile.am b/src/Makefile.am index 135f2f0..ede1fc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,10 +13,12 @@ telepathy_PYTHON = \ spec_dir = $(top_srcdir)/spec spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)) +# We leave _generated/errors.py out of here because there exists a +# spec/errors.xml file, so that means there'll be a +# _generated/errors.py in $(spec_files). See fd.o#32526 BUILT_SOURCES = \ _generated/interfaces.py \ _generated/constants.py \ - _generated/errors.py \ _generated/__init__.py \ $(spec_files) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org