From c12b6d89ca6f0f4ecc8aabf98c47b7cb98affcb06577334004b18d51bd7a5295 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 14 Mar 2013 14:00:50 +0000 Subject: [PATCH] Accepting request 158847 from devel:languages:python - add prettytable-0.7x.diff: - Be compatible with PrettyTable 0.7 - tighten rpm dependencies (forwarded request 158846 from dirkmueller) OBS-URL: https://build.opensuse.org/request/show/158847 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cliff?expand=0&rev=4 --- prettytable-0.7x.diff | 21 +++++++++++++++++++++ python-cliff.changes | 7 +++++++ python-cliff.spec | 8 +++++--- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 prettytable-0.7x.diff diff --git a/prettytable-0.7x.diff b/prettytable-0.7x.diff new file mode 100644 index 0000000..db12b00 --- /dev/null +++ b/prettytable-0.7x.diff @@ -0,0 +1,21 @@ +--- cliff.egg-info/requires.txt ++++ cliff.egg-info/requires.txt +@@ -1,4 +1,4 @@ + distribute +-PrettyTable>=0.6,<0.7 ++PrettyTable>=0.6,<0.8 + cmd2==0.6.4 +-pyparsing==1.5.7 +\ Kein Zeilenumbruch am Dateiende. ++pyparsing==1.5.7 +--- setup.py ++++ setup.py +@@ -23,7 +23,7 @@ + + install_requires = [ + 'distribute', +- 'PrettyTable>=0.6,<0.7', ++ 'PrettyTable>=0.6,<0.8', + 'cmd2==0.6.4', + ] + diff --git a/python-cliff.changes b/python-cliff.changes index 5d553bb..bbc21df 100644 --- a/python-cliff.changes +++ b/python-cliff.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 13 12:26:50 UTC 2013 - dmueller@suse.com + +- add prettytable-0.7x.diff: + - Be compatible with PrettyTable 0.7 +- tighten rpm dependencies + ------------------------------------------------------------------- Tue Mar 12 09:12:29 UTC 2013 - dmueller@suse.com diff --git a/python-cliff.spec b/python-cliff.spec index 7b7eec3..23caa0f 100644 --- a/python-cliff.spec +++ b/python-cliff.spec @@ -24,6 +24,7 @@ Summary: Command Line Interface Formulation Framework License: Apache-2.0 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/c/cliff/cliff-%{version}.tar.gz +Patch0: prettytable-0.7x.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-argparse BuildRequires: python-devel @@ -36,10 +37,10 @@ BuildRequires: python-mock BuildRequires: python-nose BuildRequires: python-pep8 BuildRequires: python-prettytable -BuildRequires: python-pyparsing +BuildRequires: python-pyparsing == 1.5.7 Requires: python-argparse -Requires: python-cmd2 -Requires: python-prettytable +Requires: python-cmd2 == 0.6.4 +Requires: python-prettytable >= 0.6 Requires: python-tablib %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -63,6 +64,7 @@ This package contains documentation files for %{name}. %prep %setup -q -n cliff-%{version} +%patch0 %build python setup.py build