diff --git a/cmd2-pyparsing201.patch b/cmd2-pyparsing201.patch new file mode 100644 index 0000000..a88298e --- /dev/null +++ b/cmd2-pyparsing201.patch @@ -0,0 +1,24 @@ +diff -ruN a/setup.py b/setup.py +--- a/setup.py 2013-08-14 22:38:59.000000000 +0200 ++++ b/setup.py 2013-09-17 15:25:23.778695646 +0200 +@@ -7,10 +7,6 @@ + return ['sqlpython'] + import sys + +-if sys.version_info < (3, 0, 0): +- install_requires = ['pyparsing == 1.5.7'] +-else: +- install_requires = ['pyparsing >= 2.0.0'] + + setup( + name="cmd2", +@@ -25,7 +21,7 @@ + license = 'MIT', + keywords = 'command prompt console cmd', + url = 'http://packages.python.org/cmd2/', +- install_requires = install_requires, ++ install_requires = 'pyparsing >= 2.0.1', + long_description = """Enhancements for standard library's cmd module. + + Drop-in replacement adds several features for command-prompt tools: +Binary files a/.setup.py.swp and b/.setup.py.swp differ diff --git a/python-cmd2.changes b/python-cmd2.changes index 2a5b9d6..8177f31 100644 --- a/python-cmd2.changes +++ b/python-cmd2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 13:28:58 UTC 2013 - speilicke@suse.com + +- Add cmd2-pyparsing201.patch: Allow running with pyparsing>=2.0.1 + ------------------------------------------------------------------- Tue Sep 3 08:04:14 UTC 2013 - dmueller@suse.com diff --git a/python-cmd2.spec b/python-cmd2.spec index 8b1d752..0145fe1 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -24,8 +24,10 @@ License: MIT Group: Development/Languages/Python Url: http://packages.python.org/cmd2/ Source: http://pypi.python.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz +# PATCH-FIX-UPSTREAM speilicke@suse.com -- Relax pyparsing requirements again +Patch0: cmd2-pyparsing201.patch BuildRequires: python-devel -Requires: python-pyparsing == 1.5.7 +Requires: python-pyparsing >= 2.0.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %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()")} @@ -54,6 +56,7 @@ Drop-in replacement adds several features for command-prompt tools: %prep %setup -q -n cmd2-%{version} +%patch0 -p1 chmod -x README.txt sed -i "s/\r//g" README.txt