From 928aaa9bb2d0b639265259e1e30069da38344ccf231552b1c3fd8f6d2baf48f0 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 23 Oct 2019 07:38:43 +0000
Subject: [PATCH] - go back to 0.8.9, cliff (which is the only user) is not
 compatible   with >= 0.9.0 atm

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=57
---
 cmd2-0.8.9.tar.gz   |  3 +++
 cmd2-0.9.16.tar.gz  |  3 ---
 python-cmd2.changes |  6 +++++
 python-cmd2.spec    | 63 ++++++++++++++++++---------------------------
 4 files changed, 34 insertions(+), 41 deletions(-)
 create mode 100644 cmd2-0.8.9.tar.gz
 delete mode 100644 cmd2-0.9.16.tar.gz

diff --git a/cmd2-0.8.9.tar.gz b/cmd2-0.8.9.tar.gz
new file mode 100644
index 0000000..d1f90ab
--- /dev/null
+++ b/cmd2-0.8.9.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:145cb677ebd0e3cae546ab81c30f6c25e0b08ba0f1071df854d53707ea792633
+size 112543
diff --git a/cmd2-0.9.16.tar.gz b/cmd2-0.9.16.tar.gz
deleted file mode 100644
index 52e3d69..0000000
--- a/cmd2-0.9.16.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d
-size 550919
diff --git a/python-cmd2.changes b/python-cmd2.changes
index 8e9b05a..0b863f3 100644
--- a/python-cmd2.changes
+++ b/python-cmd2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 23 07:35:49 UTC 2019 - Dirk Mueller <dmueller@suse.com>
+
+- go back to 0.8.9, cliff (which is the only user) is not compatible
+  with >= 0.9.0 atm
+
 -------------------------------------------------------------------
 Fri Sep 13 10:57:37 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-cmd2.spec b/python-cmd2.spec
index 53db859..3addb46 100644
--- a/python-cmd2.spec
+++ b/python-cmd2.spec
@@ -17,44 +17,36 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define         skip_python2 1
 Name:           python-cmd2
-Version:        0.9.16
+# Do not update beyond what is supported by cliff!
+Version:        0.8.9
 Release:        0
 Summary:        Extra features for standard library's cmd module
 License:        MIT
 Group:          Development/Languages/Python
-URL:            https://github.com/python-cmd2/cmd2
+Url:            http://packages.python.org/cmd2/
 Source:         https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz
-BuildRequires:  %{python_module setuptools_scm}
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
-BuildRequires:  vim
-Requires:       python-attrs >= 16.3.0
-Requires:       python-colorama >= 0.3.7
-Requires:       python-pyperclip >= 1.6
-Requires:       python-wcwidth >= 0.1.7
-BuildArch:      noarch
-%if %{python3_version_nodots} < 35
-Requires:       python-contextlib2
-Requires:       python-typing
-%endif
-# SECTION Test requirements
-BuildRequires:  %{python_module attrs >= 16.3.0}
-BuildRequires:  %{python_module colorama >= 0.3.7}
-BuildRequires:  %{python_module mock}
-BuildRequires:  %{python_module pyperclip >= 1.6}
-BuildRequires:  %{python_module pytest-mock}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module wcwidth >= 0.1.7}
-# Required by tests.
-BuildRequires:  vim
-%if 0%{?suse_version} <= 1315
 BuildRequires:  %{python_module contextlib2}
-BuildRequires:  %{python_module typing}
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module pyperclip}
+BuildRequires:  %{python_module pytest-xdist}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wcwidth}
+BuildRequires:  python-enum34
+BuildRequires:  python-rpm-macros
+BuildRequires:  python-subprocess32
+Requires:       python-pyparsing >= 2.0.1
+Requires:       python-pyperclip
+Requires:       python-six
+Requires:       python-wcwidth
+%ifpython2
+Requires:       python-contextlib2
+Requires:       python-enum34
+Requires:       python-subprocess32
 %endif
-# /SECTION
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
+
 %python_subpackages
 
 %description
@@ -78,24 +70,19 @@ Drop-in replacement adds several features for command-prompt tools:
 
 %prep
 %setup -q -n cmd2-%{version}
-# Fix non-executable-script
-sed -i -e '/^#!\//, 1d' cmd2/cmd2.py
-# Fix spurious-executable-perm
-chmod a-x README.md
 
 %build
 %python_build
 
 %install
 %python_install
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%pytest
+%python_exec setup.py test
 
 %files %{python_files}
 %license LICENSE
-%doc CHANGELOG.md CODEOWNERS README.md
-%{python3_sitelib}/*
+%doc README.md
+%{python_sitelib}/*
 
 %changelog