From add54483edb09e48e35e324ff8a49e869c62181e Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Sep 16 2019 14:56:48 +0000
Subject: Drop the python2 subpackage (bz 1752149).


---

diff --git a/python-manuel.spec b/python-manuel.spec
index bf99719..71640da 100644
--- a/python-manuel.spec
+++ b/python-manuel.spec
@@ -2,7 +2,7 @@
 
 Name:           python-%{srcname}
 Version:        1.10.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Build tested documentation
 
 License:        ASL 2.0
@@ -10,11 +10,6 @@ URL:            https://pypi.python.org/pypi/manuel
 Source0:        https://github.com/benji-york/manuel/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  python2-devel
-BuildRequires:  python2dist(setuptools)
-BuildRequires:  python2dist(six)
-BuildRequires:  python2dist(zope.testrunner)
-
 BuildRequires:  python3-devel
 BuildRequires:  python3dist(setuptools)
 BuildRequires:  python3dist(six)
@@ -26,80 +21,43 @@ Manuel lets you mix and match traditional doctests with custom test
 syntax.  Several plug-ins are included that provide new test syntax.
 You can also create your own plug-ins.
 
-%package -n python2-manuel
+%package -n python3-%{srcname}
 Summary:        Build tested documentation
-Requires:       python2dist(six)
 Provides:       bundled(jquery)
-%{?python_provide:%python_provide python2-%{srcname}}
 
-%description -n python2-manuel
-Manuel lets you mix and match traditional doctests with custom test
-syntax.  Several plug-ins are included that provide new test syntax.
-You can also create your own plug-ins.
-
-%package -n python3-manuel
-Summary:        Build tested documentation
-Requires:       python3dist(six)
-Provides:       bundled(jquery)
+# This can be removed when Fedora 30 reaches EOL
+Obsoletes:      python2-%{srcname} < 1.10.1-6
+Provides:       python2-%{srcname} = %{version}-%{release}
 
-%description -n python3-manuel
+%description -n python3-%{srcname}
 Manuel lets you mix and match traditional doctests with custom test
 syntax.  Several plug-ins are included that provide new test syntax.
 You can also create your own plug-ins.
 
 %prep
-%setup -q -c
-
-# Prepare for a python3 build
-cp -a %{srcname}-%{version} python3-%{srcname}-%{version}
+%autosetup -n %{srcname}-%{version}
 
 %build
-# Python 2 build
-pushd %{srcname}-%{version}
-%py2_build
-popd
-
-# Python 3 build
-pushd python3-%{srcname}-%{version}
 %py3_build
-sphinx-build-3 -c sphinx src/manuel docs
+sphinx-build -c sphinx src/manuel docs
 rm -fr docs/.buildinfo docs/.doctrees
-popd
 
 %install
-# Python 2 install
-pushd %{srcname}-%{version}
-%py2_install
-popd
-
-# Python 3 install
-pushd python3-%{srcname}-%{version}
 %py3_install
-popd
 
 %check
-# Python 2 tests
-pushd %{srcname}-%{version}
-%{__python2} setup.py test
-popd
-
-# Python 3 tests
-pushd python3-%{srcname}-%{version}
 %{__python3} setup.py test
-popd
-
-%files -n python2-%{srcname}
-%license %{srcname}-%{version}/LICENSE.rst
-%{python2_sitelib}/manuel/
-%{python2_sitelib}/manuel-%{version}-*
 
 %files -n python3-%{srcname}
-%doc python3-%{srcname}-%{version}/docs
-%license python3-%{srcname}-%{version}/LICENSE.rst
+%doc docs/*
+%license LICENSE.rst
 %{python3_sitelib}/manuel/
 %{python3_sitelib}/manuel-%{version}-*
 
 %changelog
+* Mon Sep 16 2019 Jerry James <loganjerry@gmail.com> - 1.10.1-6
+- Drop the python2 subpackage (bz 1752149)
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.10.1-5
 - Rebuilt for Python 3.8