From 8126b7d63de7f2e81220c5dd26d071961cbd571e07dbc08c931146799fc7e4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 22 Nov 2019 11:18:25 +0000
Subject: [PATCH] - Fix up dependencies and everything after last update to
 0.9.20

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=64
---
 python-cmd2.changes |  5 +++++
 python-cmd2.spec    | 37 ++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/python-cmd2.changes b/python-cmd2.changes
index 2af5357..12497a5 100644
--- a/python-cmd2.changes
+++ b/python-cmd2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 22 10:46:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Fix up dependencies and everything after last update to 0.9.20
+
 -------------------------------------------------------------------
 Thu Nov 14 15:18:49 CET 2019 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-cmd2.spec b/python-cmd2.spec
index 7a22db9..8913cd5 100644
--- a/python-cmd2.spec
+++ b/python-cmd2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-cmd2
 #
-# Copyright (c) 2019 SUSE LLC.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,28 +17,30 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python2 1
+%define         skip_python2 1
 Name:           python-cmd2
-# Do not update beyond what is supported by cliff!
 Version:        0.9.20
 Release:        0
 Summary:        Extra features for standard library's cmd module
 License:        MIT
 URL:            https://github.com/python-cmd2/cmd2
 Source:         https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz
-BuildRequires:  %{python_module pytest-xdist}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module wcwidth}
-BuildRequires:  python-enum34
+BuildRequires:  %{pythons}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  python-subprocess32
-BuildRequires:  python3
-Requires:       python-pyparsing >= 2.0.1
-Requires:       python-pyperclip
-Requires:       python-six
-Requires:       python-wcwidth
+BuildRequires:  vim
+Requires:       python
+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}
@@ -48,12 +50,10 @@ BuildRequires:  %{python_module pytest-mock}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module wcwidth >= 0.1.7}
 # Required by tests.
-BuildRequires:  fdupes
 BuildRequires:  vim
 %if 0%{?suse_version} <= 1315
 BuildRequires:  %{python_module contextlib2}
-Requires:       python-enum34
-Requires:       python-subprocess32
+BuildRequires:  %{python_module typing}
 %endif
 # /SECTION
 %python_subpackages
@@ -79,12 +79,11 @@ 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
 
-# Remove spurious shebang
-sed -i -e '/^#!\/usr\/bin\/env python/d' cmd2/cmd2.py
-
 %build
 %python_build
 
@@ -97,7 +96,7 @@ sed -i -e '/^#!\/usr\/bin\/env python/d' cmd2/cmd2.py
 
 %files %{python_files}
 %license LICENSE
-%doc CHANGELOG.md README.md
+%doc CHANGELOG.md CODEOWNERS README.md
 %{python3_sitelib}/*
 
 %changelog