From d07a8901bffaffe6a2aa12a6d69caafe25a13bf9524c670d43ce7e7c36dabfab Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 29 Jun 2013 17:43:29 +0000 Subject: [PATCH] Accepting request 181149 from devel:languages:python - add python-2.6.x.diff: * fix build on python 2.6 (forwarded request 181092 from dirkmueller) OBS-URL: https://build.opensuse.org/request/show/181149 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-stevedore?expand=0&rev=7 --- python-2.6.x.diff | 12 ++++++++++++ python-stevedore.changes | 6 ++++++ python-stevedore.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 python-2.6.x.diff diff --git a/python-2.6.x.diff b/python-2.6.x.diff new file mode 100644 index 0000000..ec51214 --- /dev/null +++ b/python-2.6.x.diff @@ -0,0 +1,12 @@ +--- docs/source/conf.py ++++ docs/source/conf.py +@@ -54,7 +54,8 @@ + # built documents. + # + # The short X.Y version. +-version = subprocess.check_output(['sh', '-c', 'cd ../..; python setup.py --version']) ++version = subprocess.Popen(['sh', '-c', 'cd ../..; python setup.py --version'], ++ stdout=subprocess.PIPE).stdout.read() + version = version.strip() + # The full version, including alpha/beta/rc tags. + release = version diff --git a/python-stevedore.changes b/python-stevedore.changes index 5266725..c596b8d 100644 --- a/python-stevedore.changes +++ b/python-stevedore.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 21 07:52:49 UTC 2013 - dmueller@suse.com + +- add python-2.6.x.diff: + * fix build on python 2.6 + ------------------------------------------------------------------- Mon Jun 17 13:48:35 UTC 2013 - speilicke@suse.com diff --git a/python-stevedore.spec b/python-stevedore.spec index 1a3bc7b..acd54ff 100644 --- a/python-stevedore.spec +++ b/python-stevedore.spec @@ -24,6 +24,7 @@ License: Apache-2.0 Group: Development/Languages/Python Url: https://github.com/dreamhost/stevedore Source: http://pypi.python.org/packages/source/s/stevedore/stevedore-%{version}.tar.gz +Patch0: python-2.6.x.diff BuildRequires: python-devel BuildRequires: python-distribute # Documentation requirements: @@ -43,6 +44,7 @@ Manage dynamic plugins for Python applications %prep %setup -q -n stevedore-%{version} +%patch0 %build python setup.py build