Hello community, here is the log from the commit of package python-cliff for openSUSE:Factory checked in at 2013-09-23 13:15:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cliff (Old) and /work/SRC/openSUSE:Factory/.python-cliff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cliff" Changes: -------- --- /work/SRC/openSUSE:Factory/python-cliff/python-cliff.changes 2013-09-11 13:07:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-cliff.new/python-cliff.changes 2013-09-23 13:15:30.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 17 13:29:29 UTC 2013 - speili...@suse.com + +- Add 0001-Require-pyparsing-2.0.1.patch: Allow running with pyparsing>=2.0.1 + +------------------------------------------------------------------- New: ---- 0001-Require-pyparsing-2.0.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cliff.spec ++++++ --- /var/tmp/diff_new_pack.mGL0yU/_old 2013-09-23 13:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.mGL0yU/_new 2013-09-23 13:15:30.000000000 +0200 @@ -25,6 +25,8 @@ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/c/cliff/cliff-%{version}.tar.gz Patch0: relax-cmd2-requires.diff +# PATCH-FIX-UPSTREAM speili...@suse.com -- Backport of https://github.com/dreamhost/cliff/pull/47 +Patch1: 0001-Require-pyparsing-2.0.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-argparse BuildRequires: python-devel @@ -37,11 +39,11 @@ BuildRequires: python-mock >= 1.0.1 BuildRequires: python-nose BuildRequires: python-pep8 -BuildRequires: python-pyparsing == 1.5.7 +BuildRequires: python-pyparsing >= 2.0.1 Requires: python-PrettyTable >= 0.6 Requires: python-argparse Requires: python-cmd2 >= 0.6.4 -Requires: python-pyparsing == 1.5.7 +Requires: python-pyparsing >= 2.0.1 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()")} @@ -66,6 +68,7 @@ %prep %setup -q -n cliff-%{version} %patch0 +%patch1 -p1 %build python setup.py build ++++++ 0001-Require-pyparsing-2.0.1.patch ++++++ diff -ruN a/setup.py b/setup.py --- a/setup.py 2013-09-17 15:34:02.201817935 +0200 +++ b/setup.py 2013-09-17 15:33:51.693994249 +0200 @@ -18,17 +18,9 @@ install_requires = [ 'PrettyTable>=0.6,<0.8', 'cmd2>=0.6.4,<0.6.7', + 'pyparsing>=2.0.1' ] -# We need a different version of PyParsing, depending on which version -# of Python we're using. cmd2 should have this set properly, but until -# there is a release declare the dependency ourselves. -# http://trac-hg.assembla.com/python-cmd2/rev/a5f3d5a89d6c -if sys.version_info[0] < 3: - install_requires.append('pyparsing==1.5.7') -else: - install_requires.append('pyparsing>=2.0.0') - try: import argparse # noqa except ImportError: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
