[python-manuel] New upstream release. Drop upstreamed patch. Drop conf.py, now included in upstream source. Avoid us

[Jerry James]

commit 889779a2a3d9289f515d95140e9b827ea11538c7
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Wed Jul 23 13:22:07 2014 -0600

    New upstream release.
    Drop upstreamed patch.
    Drop conf.py, now included in upstream source.
    Avoid use of py3dir, which is not cleaned.

 .gitignore                                      |    2 +-
 conf.py                                         |   15 -----
 python-manuel-doctest-fix-with-python-3.4.patch |   27 --------
 python-manuel.spec                              |   75 +++++++++++++----------
 sources                                         |    2 +-
 5 files changed, 44 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc76454..26fbd49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/manuel-1.7.2.tar.gz
+/manuel-1.8.0.tar.gz
diff --git a/python-manuel.spec b/python-manuel.spec
index 43e5625..ea1a08b 100644
--- a/python-manuel.spec
+++ b/python-manuel.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 %global with_python3 1
 %endif
 
@@ -8,21 +8,17 @@
 %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
-Name:           python-manuel
-Version:        1.7.2
-Release:        6%{?dist}
+%global pkgname manuel
+
+Name:           python-%{pkgname}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Build tested documentation
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            https://pypi.python.org/pypi/manuel
-Source0:        https://pypi.python.org/packages/source/m/manuel/manuel-%{version}.tar.gz
-# The sphinx configuration file was mistakenly left out of the 1.7.2 release.
-# This file was collected from subversion.
-Source1:        conf.py
-# Fix doctests with Python 3.4
-# https://github.com/benji-york/manuel/pull/4
-Patch0:         python-manuel-doctest-fix-with-python-3.4.patch
+Source0:        https://pypi.python.org/packages/source/m/%{pkgname}/%{pkgname}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools
@@ -60,67 +56,80 @@ You can also create your own plug-ins.
 %endif
 
 %prep
-%setup -q -n manuel-%{version}
-rm -fr src/manuel.egg-info
-mkdir sphinx
-cp -p %{SOURCE1} sphinx
+%setup -q -c
 
-%patch0 -p1
+# Remove prebuilt egg
+rm -fr %{pkgname}-%{version}/src/%{pkgname}.egg-info
 
 %if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
+# Prepare for a python3 build
+cp -a %{pkgname}-%{version} python3-%{pkgname}-%{version}
 %endif
 
 %build
+# Python 2 build
+pushd %{pkgname}-%{version}
 %{__python2} setup.py build
-
-# Build the documentation, then remove leftover build files
 sphinx-build -c sphinx src/manuel docs
 rm -fr docs/.buildinfo docs/.doctrees
+popd
 
-# Build for python3
 %if 0%{?with_python3}
-pushd %{py3dir}
+# Python 3 build
+pushd python3-%{pkgname}-%{version}
 %{__python3} setup.py build
+sphinx-build-3 -c sphinx src/manuel docs
+rm -fr docs/.buildinfo docs/.doctrees
 popd
 %endif
 
 %install
+# Python 2 install
+pushd %{pkgname}-%{version}
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+popd
+
 %if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{python3_sitelib}/manuel/*.txt
+# Python 3 install
+pushd python3-%{pkgname}-%{version}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
 popd
 %endif
 
-%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
-# Remove text files that are included as HTML in docs
-rm -f $RPM_BUILD_ROOT%{python2_sitelib}/manuel/*.txt
-
 %check
+# Python 2 tests
+pushd %{pkgname}-%{version}
 %{__python2} setup.py test
+popd
 
 %if 0%{?with_python3}
-pushd %{py3dir}
+# Python 3 tests
+pushd python3-%{pkgname}-%{version}
 %{__python3} setup.py test
 popd
 %endif
 
 %files
-%doc CHANGES.txt COPYRIGHT.txt LICENSE.txt README.rst docs
+%doc %{pkgname}-%{version}/docs
+%license %{pkgname}-%{version}/LICENSE.rst
 %{python2_sitelib}/manuel/
 %{python2_sitelib}/manuel-%{version}-*
 
 %if 0%{?with_python3}
 %files -n python3-manuel
-%doc CHANGES.txt COPYRIGHT.txt LICENSE.txt README.rst docs
+%doc python3-%{pkgname}-%{version}/docs
+%license python3-%{pkgname}-%{version}/LICENSE.rst
 %{python3_sitelib}/manuel/
 %{python3_sitelib}/manuel-%{version}-*
 %endif
 
 %changelog
+* Wed Jul 23 2014 Jerry James <loganjerry at gmail.com> - 1.8.0-1
+- New upstream release
+- Drop upstreamed patch
+- Drop conf.py, now included in upstream source
+- Avoid use of py3dir, which is not cleaned
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 7f032aa..9d8eba1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c4d173072b5cc1c4ccf6739498b77b5  manuel-1.7.2.tar.gz
+39c7d08178a45f76a70caa6c7cf19e91  manuel-1.8.0.tar.gz