Workaround import mishmash in %check

The namespace sphinxcontrib package made this problematic,
because the package in $pwd was not namespace, but regular.

Alternatively, sphinxcontrib/__init__.py could have been deleted,
but not in %prep, because the package does not install without it.

This solution makes sure we are testing what we are shipping.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1733681

.gitignore

@@ -2,3 +2,6 @@
 /sphinxcontrib-websupport-1.0.1.dev20171013.tar.gz
 /88d4fdd163efdeaab91a105b7980c42078ed3417.tar.gz
 /ebe84efc1a869da8d5689c706cdcf6ea864f0d9b.tar.gz
+/sphinxcontrib-websupport-1.1.0.tar.gz
+/sphinxcontrib-websupport-1.1.1.dev20190321.tar.gz
+/sphinxcontrib-websupport-1.1.2.tar.gz

python-sphinxcontrib-websupport.spec

@@ -1,114 +1,88 @@
-%if 0%{?fedora} || 0%{?rhel} > 7
-%global with_python3 1
-%endif
-
-%global commit ebe84efc1a869da8d5689c706cdcf6ea864f0d9b
 %global pypi_name sphinxcontrib-websupport
 
 Name:           python-%{pypi_name}
-Version:        1.0.1
-Release:        11.20180316git%{?dist}
+Version:        1.1.2
+Release:        2%{?dist}
 Summary:        Sphinx API for Web Apps
 
 License:        BSD
 URL:            http://sphinx-doc.org/
-Source0:        https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/%{commit}.tar.gz
+Source0:        %{pypi_source}
 BuildArch:      noarch
 
 %description
 sphinxcontrib-websupport provides a Python API to easily integrate Sphinx
 documentation into your Web application.
 
-%package -n     python2-%{pypi_name}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{pypi_name}}
-BuildRequires:  python2-devel
-BuildRequires:  python2-docutils
-BuildRequires:  python2-jinja2
-BuildRequires:  python2-mock
-BuildRequires:  python2-pytest
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-six
-BuildRequires:  python2-sphinx
-BuildRequires:  python2-sqlalchemy
-BuildRequires:  python2-whoosh
-Requires:       python2-docutils
-Requires:       python2-jinja2
-Requires:       python2-six
-Requires:       python2-sphinx
-Requires:       python2-sqlalchemy
-Requires:       python2-whoosh
-
-%description -n python2-%{pypi_name}
-sphinxcontrib-websupport provides a Python API to easily integrate Sphinx
-documentation into your Web application.
-
-%if 0%{?with_python3}
 %package -n     python3-%{pypi_name}
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{pypi_name}}
 BuildRequires:  python3-devel
-BuildRequires:  python3-docutils
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-jinja2
 BuildRequires:  python3-mock
 BuildRequires:  python3-pytest
 BuildRequires:  python3-six
 BuildRequires:  python3-sphinx
+BuildRequires:  python3-sphinxcontrib-serializinghtml >= 1.1.3
 BuildRequires:  python3-sqlalchemy
 BuildRequires:  python3-whoosh
-Requires:       python3-docutils
 Requires:       python3-jinja2
 Requires:       python3-six
 Requires:       python3-sphinx
-Requires:       python3-sqlalchemy
-Requires:       python3-whoosh
+Requires:       python3-sphinxcontrib-serializinghtml >= 1.1.3
+Recommends:     python3-sqlalchemy
+Recommends:     python3-whoosh
 
 %description -n python3-%{pypi_name}
 sphinxcontrib-websupport provides a Python API to easily integrate Sphinx
 documentation into your Web application.
-%endif
 
 %prep
-%autosetup -n %{pypi_name}-%{commit}
+%autosetup -n %{pypi_name}-%{version}
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
 %build
-%if 0%{?with_python3}
 %py3_build
-%endif
-%py2_build
 
 %install
-%if 0%{?with_python3}
 %py3_install
-%endif
-%py2_install
 
 %check
-PYTHONPATH=. py.test tests/
-%if 0%{?with_python3}
-PYTHONPATH=. py.test-3 tests/
-%endif
+mkdir empty && pushd empty # don't run the tests from sources
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+%{__python3} -m pytest ../tests
+popd
+rmdir empty
 
-%files -n python2-%{pypi_name}
-%license LICENSE
-%doc README.rst
-%{python2_sitelib}/sphinxcontrib/websupport
-%{python2_sitelib}/sphinxcontrib_websupport-*.pth
-%{python2_sitelib}/sphinxcontrib_websupport-*.egg-info
-
-%if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %license LICENSE
 %doc README.rst
-%{python3_sitelib}/sphinxcontrib/websupport
+%dir %{python3_sitelib}/sphinxcontrib
+%{python3_sitelib}/sphinxcontrib/websupport/
 %{python3_sitelib}/sphinxcontrib_websupport-*.pth
-%{python3_sitelib}/sphinxcontrib_websupport-*.egg-info
-%endif
+%{python3_sitelib}/sphinxcontrib_websupport-*.egg-info/
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 20 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.2-1
+- Update to 1.1.2 (#1711650)
+
+* Wed Mar 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1~dev20190321-1
+- Update to 1.1.1.dev20190321 (#1691429)
+- Support Sphinx 2.0 (#1690793)
+
+* Wed Mar 06 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.0-1
+- Update to 1.1.0
+- Subpackage python2-sphinxcontrib-websupport has been removed
+  See https://fedoraproject.org/wiki/Changes/Sphinx2
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-12.20180316git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jul 16 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-11.20180316git
 - Remove unused dependency on xapian
 

sources

@@ -1 +1 @@
-SHA512 (ebe84efc1a869da8d5689c706cdcf6ea864f0d9b.tar.gz) = a33c32cd20c24a714c149059953492e2bacf590a912cc2144935021ad4c2639eb7a47986f31bebf028bcc43de3a842bde0215602213d883d3cc0ed9abf78e747
+SHA512 (sphinxcontrib-websupport-1.1.2.tar.gz) = 55754f6304f38abd50f410da164f401a1b9a1d289b19f0077a38f72ce11a2dd64eff0713bb99471e470ff15fbd6a0042d49bab14c92f82cdd61019adbb88397e