From 7b88de05a852b409e8a9c47bd6c2e04b3e437b49 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Jul 23 2018 22:55:21 +0000
Subject: Fix FTBFS bug #1605635

Update to 0.8.8 - Fixes bug #1568598

---

diff --git a/.gitignore b/.gitignore
index 956b9b9..3536ce4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /cmd2-0.6.4.tar.gz
 /cmd2-0.6.7.tar.gz
 /cmd2-0.6.8.tar.gz
+/cmd2-0.8.8.tar.gz
diff --git a/python-cmd2-python35-compat.patch b/python-cmd2-python35-compat.patch
deleted file mode 100644
index 631c863..0000000
--- a/python-cmd2-python35-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/cmd2.py
-+++ b/cmd2.py
-@@ -47,6 +47,13 @@
- if sys.version_info[0] == 2:
-     pyparsing.ParserElement.enablePackrat()
- 
-+try:
-+    is_mswindows = subprocess.mswindows
-+except AttributeError:
-+    # Python 3.5+
-+    is_mswindows = subprocess._mswindows
-+
-+
- """
- Packrat is causing Python3 errors that I don't understand.
- 
-@@ -184,7 +191,7 @@
- to be installed on operating system.
- %s"""
- 
--if subprocess.mswindows:
-+if is_mswindows:
-     try:
-         import win32clipboard
-         def get_paste_buffer():
diff --git a/python-cmd2.spec b/python-cmd2.spec
index f7e80f7..658b258 100644
--- a/python-cmd2.spec
+++ b/python-cmd2.spec
@@ -5,21 +5,16 @@
 %global modname cmd2
 
 Name:             python-cmd2
-Version:          0.6.8
-Release:          16%{?dist}
+Version:          0.8.8
+Release:          1%{?dist}
 Summary:          Extra features for standard library's cmd module
 
 Group:            Development/Libraries
 License:          MIT
 URL:              http://pypi.python.org/pypi/cmd2
 Source0:          http://pypi.python.org/packages/source/c/%{modname}/%{modname}-%{version}.tar.gz
-
-# https://bitbucket.org/catherinedevlin/cmd2/issues/18
-Patch0:           python-cmd2-python35-compat.patch
-
 BuildArch:        noarch
 
-
 BuildRequires:    python2-devel
 BuildRequires:    dos2unix
 
@@ -97,10 +92,6 @@ See docs at http://packages.python.org/cmd2/
 
 %prep
 %setup -q -n %{modname}-%{version}
-%patch0 -p1
-
-chmod -x README.txt
-dos2unix README.txt
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -108,7 +99,7 @@ cp -a . %{py3dir}
 %endif
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -123,22 +114,28 @@ pushd %{py3dir}
 popd
 %endif
 
-%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
+%{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
 
 %files -n python2-cmd2
-%doc README.txt
-%{python_sitelib}/cmd2.py*
-%{python_sitelib}/%{modname}-%{version}*
+%license LICENSE
+%doc CHANGELOG.md CODEOWNERS CONTRIBUTING.md README.md
+%{python2_sitelib}/cmd2.py*
+%{python2_sitelib}/%{modname}-%{version}*
 
 %if 0%{?with_python3}
 %files -n python3-%{modname}
-%doc README.txt
+%license LICENSE
+%doc CHANGELOG.md CODEOWNERS CONTRIBUTING.md README.md
 %{python3_sitelib}/cmd2.py*
 %{python3_sitelib}/__pycache__/cmd2*
 %{python3_sitelib}/%{modname}-%{version}*
 %endif
 
 %changelog
+* Mon Jul 23 2018 Kevin Fenzi <kevin@scrye.com> - 0.8.8-1
+- Fix FTBFS bug #1605635
+- Update to 0.8.8 - Fixes bug #1568598
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.8-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index fd24573..b23679d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c32c9a897e010c977b50c1ddc13f09fe  cmd2-0.6.8.tar.gz
+SHA512 (cmd2-0.8.8.tar.gz) = 7d337ac2da01268f0b465c177e24b75bb01aaaf4507846dab025db0559160d1055e21d2d98a345f515c04dc7d29ab2e484c17242edf209db3d705cba08ecf9b1