[python-telepathy] Fixed a build failure using a patch from upstream git
belegdol
belegdol at fedoraproject.org
Tue Jun 14 19:31:21 UTC 2011
commit 81bdb2628b32e939b3a7c2950a6b6ef14cc9e4f8
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date: Tue Jun 14 21:21:56 2011 +0200
Fixed a build failure using a patch from upstream git
python-telepathy-0.15.19-autotools.patch | 28 ++++++++++++++++++++++++++++
python-telepathy.spec | 8 +++++++-
2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/python-telepathy-0.15.19-autotools.patch b/python-telepathy-0.15.19-autotools.patch
new file mode 100644
index 0000000..3d5e933
--- /dev/null
+++ b/python-telepathy-0.15.19-autotools.patch
@@ -0,0 +1,28 @@
+diff -up telepathy-python-0.15.19/src/Makefile.am.autotools telepathy-python-0.15.19/src/Makefile.am
+--- telepathy-python-0.15.19/src/Makefile.am.autotools 2010-06-09 20:28:59.000000000 +0200
++++ telepathy-python-0.15.19/src/Makefile.am 2011-06-14 21:19:42.692499952 +0200
+@@ -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)
+
+diff -up telepathy-python-0.15.19/src/Makefile.in.autotools telepathy-python-0.15.19/src/Makefile.in
+--- telepathy-python-0.15.19/src/Makefile.in.autotools 2010-12-03 17:09:48.000000000 +0100
++++ telepathy-python-0.15.19/src/Makefile.in 2011-06-14 21:19:42.693499955 +0200
+@@ -219,7 +219,6 @@ spec_files := $(patsubst $(spec_dir)%.xm
+ BUILT_SOURCES = \
+ _generated/interfaces.py \
+ _generated/constants.py \
+- _generated/errors.py \
+ _generated/__init__.py \
+ $(spec_files)
+
diff --git a/python-telepathy.spec b/python-telepathy.spec
index 4c6df32..7c84174 100644
--- a/python-telepathy.spec
+++ b/python-telepathy.spec
@@ -2,13 +2,15 @@
Name: python-telepathy
Version: 0.15.19
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python libraries for Telepathy
Group: Development/Languages
License: LGPLv2+
URL: http://telepathy.freedesktop.org/wiki/
Source0: http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
+#Upstream git commit 0c4e6e9f41b24bbb7ea33653b8a81ff79c0ea032
+Patch0: python-telepathy-0.15.19-autotools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -25,6 +27,7 @@ Python libraries for use in Telepathy clients and connection managers.
%prep
%setup -q -n telepathy-python-%{version}
+%patch0 -p1 -b .autotools
%build
@@ -49,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 14 2011 Julian Sikorski <belegdol at fedoraproject.org> - 0.15.19-3
+- Fixed a build failure using a patch from upstream git
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list