From f0b2c34307b5b747856bc88cb6a9deca51547ab8a2e440f1a63a61f4e8c4df32 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 11 Sep 2013 11:07:22 +0000 Subject: [PATCH] Accepting request 198230 from devel:languages:python - add relax-cmd2-requires.diff: Allow 0.6.6.1 or newer (forwarded request 197970 from dirkmueller) OBS-URL: https://build.opensuse.org/request/show/198230 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cliff?expand=0&rev=12 --- python-cliff.changes | 5 +++++ python-cliff.spec | 2 ++ relax-cmd2-requires.diff | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 relax-cmd2-requires.diff diff --git a/python-cliff.changes b/python-cliff.changes index 8d75ef2..0f7cf94 100644 --- a/python-cliff.changes +++ b/python-cliff.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 08:47:28 UTC 2013 - dmueller@suse.com + +- add relax-cmd2-requires.diff: Allow 0.6.6.1 or newer + ------------------------------------------------------------------- Tue Sep 3 08:01:39 UTC 2013 - dmueller@suse.com diff --git a/python-cliff.spec b/python-cliff.spec index 819e51a..5b666b1 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: relax-cmd2-requires.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-argparse BuildRequires: python-devel @@ -64,6 +65,7 @@ This package contains documentation files for %{name}. %prep %setup -q -n cliff-%{version} +%patch0 %build python setup.py build diff --git a/relax-cmd2-requires.diff b/relax-cmd2-requires.diff new file mode 100644 index 0000000..09af825 --- /dev/null +++ b/relax-cmd2-requires.diff @@ -0,0 +1,22 @@ +--- cliff.egg-info/requires.txt ++++ cliff.egg-info/requires.txt +@@ -1,3 +1,3 @@ + PrettyTable>=0.6,<0.8 +-cmd2>=0.6.4,<0.6.6 +-pyparsing==1.5.7 +\ No newline at end of file ++cmd2>=0.6.4,<0.6.7 ++pyparsing==1.5.7 +--- setup.py ++++ setup.py +@@ -17,9 +17,7 @@ + + install_requires = [ + 'PrettyTable>=0.6,<0.8', +- # Restrict cliff from bringing in cmd2 0.6.6 until the problem +- # with the Python 3-only code is resolved. +- 'cmd2>=0.6.4,<0.6.6', ++ 'cmd2>=0.6.4,<0.6.7', + ] + + # We need a different version of PyParsing, depending on which version