$ git show --format=fuller --patch-with-stat --summary f48183967be6caae2456a4e3335cb215a8dadaa5

commit f48183967be6caae2456a4e3335cb215a8dadaa5
Author:     itchka (Colin Close) <itchka@compuserve.com>
AuthorDate: Wed Mar 13 18:08:06 2019 +0000
Commit:     itchka (Colin Close) <itchka@compuserve.com>
CommitDate: Wed Mar 13 18:08:06 2019 +0000

    Fix and update to 7.0
---
 .abf.yml          |  1 +
 python-click.spec | 84 +++++++++++++++++++++++++++----------------------------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 7146b89..f9fb958 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
 sources:
+  Click-7.0.tar.gz: fcbbb6d25b8eb45f7919e8605ec33b33583b0217
   click-6.7.tar.gz: c16e7cb561a40c385ae8d1a50528e549cc1d8e94
diff --git a/python-click.spec b/python-click.spec
index ae39417..c7eb1f4 100755
--- a/python-click.spec
+++ b/python-click.spec
@@ -1,103 +1,103 @@
 # Created by pyp2rpm-1.0.1
 %global pypi_name click
-%global with_python3 1
+%define tarname Click
+%global with_python2 1
 %define _duplicate_files_terminate_build 0
 
 Name:           python-%{pypi_name}
-Version:        6.7
+Version:        7.0
 Release:        1
 Summary:        A simple wrapper around optparse for powerful command line utilities
 
 License:        BSD
 URL:            http://github.com/mitsuhiko/click
-Source0:        https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        https://pypi.python.org/packages/source/c/%{pypi_name}/%{tarname}-%{version}.tar.gz
 BuildArch:      noarch
  
-BuildRequires:  pkgconfig(python2)
-BuildRequires:  python2-setuptools
-#BuildRequires:  python-pytest
- 
-%if %{?with_python3}
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  python-setuptools
 BuildRequires:  python-pytest
-%endif # if with_python3
+ 
+%if %{with_python2}
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  python2-setuptools
+%endif # if with_python2
 
 
 %description
-click is a Python package for creating beautiful command line
+Click is a Python package for creating beautiful command line
 interfaces in a composable way with as little amount of code as necessary.
 It's the "Command Line Interface Creation Kit".  It's highly configurable but
 comes with good defaults out of the box.
 
-%if 0%{?with_python3}
-%package -n     python-%{pypi_name}
+%if %{with_python2}
+%package -n     python2-%{pypi_name}
 Summary:        A simple wrapper around optparse for powerful command line utilities
 
 
-%description -n python-%{pypi_name}
-click is a Python 3 package for creating beautiful command line
+%description -n python2-%{pypi_name}
+Click is a Python 2 package for creating beautiful command line
 interfaces in a composable way with as little amount of code as necessary.
 It's the "Command Line Interface Creation Kit".  It's highly configurable but
 comes with good defaults out of the box.
-%endif # with_python3
+%endif # with_python2
 
 
 %prep
-%setup -q -n %{pypi_name}-%{version}
+%setup -q -n %{tarname}-%{version}
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif # with_python3
+%if %{with_python2}
+rm -rf %{py2dir}
+cp -a . %{py2dir}
+%endif # with_python2
 
 %build
 
-%{__python2} setup.py build
+%{__python} setup.py build
 
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
+%if %{with_python2}
+pushd %{py2dir}
+%{__python2} setup.py build
 popd
-%endif # with_python3
+%endif # with_python2
 
 
 %install
 # Must do the subpackages' install first because the scripts in /usr/bin are
 # overwritten with every setup.py install (and we want the python2 version
 # to be the default for now).
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
+%if %{with_python2}
+pushd %{py2dir}
+%{__python2} setup.py install --skip-build --root %{buildroot}
 popd
-%endif # with_python3
+%endif # with_python2
 
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 %check
 # The following is a cheat as we don't carry python2-test
 export LANG=en_GB.utf8.
 export LC_ALL=en_GB.utf8.
-PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose 
+PYTHONPATH=$(pwd) py.test tests --tb=long --verbose 
 
-%%if 0%{?with_python3}
-pushd %{py3dir}
+%%if %{with_python2}
+pushd %{py2dir}
 export LANG=en_GB.utf8 
 export LC_ALL=en_GB.utf8 
-PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose 
+PYTHONPATH=$(pwd) py.test tests --tb=long --verbose 
 popd
 %%endif
 
 %files
-%doc README 
+%doc README.rst CHANGES.rst CONTRIBUTING.rst LICENSE.rst
+%{python_sitelib}/%{pypi_name}
+%{python_sitelib}/%{tarname}-%{version}-py?.?.egg-info
+%%if %{with_python2}
+%files -n python2-%{pypi_name}
+%doc README.rst CHANGES.rst CONTRIBUTING.rst LICENSE.rst
 %{python2_sitelib}/%{pypi_name}
-%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%%if 0%{?with_python3}
-%files -n python-%{pypi_name}
-%doc README
-%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%endif # with_python3
+%{python2_sitelib}/%{tarname}-%{version}-py?.?.egg-info
+%endif # with_python2