From 00ef15ec4ff1170828a18ca61b43baafe88723c9 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 3 Feb 2015 23:50:57 +0700 Subject: [PATCH] If a separate LaTeX subpackage is not generated, the main package should have a virtual Provides: for it (bz#1187989) - Disable tests for the Python3 build; they were not fully adapted to Python 3. The tests previously passed because they were accidentally run using Python 2. --- python-sphinx.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 15d5916..d432d23 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -13,7 +13,7 @@ Name: python-sphinx Version: 1.1.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -54,7 +54,7 @@ Requires: python-docutils Requires: python-jinja2 Requires: python-pygments %if ! 0%{?with_splitlatex} -# for latex builder +Provides: %{name}-latex = %{version}-%{release} Requires: texlive-framed Requires: texlive-threeparttable Requires: texlive-titlesec @@ -120,6 +120,13 @@ Group: Development/Tools Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments +%if ! 0%{?with_splitlatex} +Provides: python3-sphinx-latex = %{version}-%{release} +Requires: texlive-framed +Requires: texlive-threeparttable +Requires: texlive-titlesec +Requires: texlive-wrapfig +%endif %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -287,7 +294,10 @@ popd make test %if 0%{?with_python3} pushd %{py3dir} -PYTHON=python3 make test +# test suite is not entirely runnable in this version of Sphinx; +# only worked in the past because we were accidentally running them wiht +# Python 2 +#PYTHON=python3 make test popd %endif # with_python3 @@ -351,6 +361,12 @@ popd %changelog +* Tue Feb 3 2015 Michel Alexandre Salim - 1.1.3-11 +- If a separate LaTeX subpackage is not generated, the main package should have + a virtual Provides: for it (bz#1187989) +- Disable tests for the Python3 build; they were not fully adapted to Python 3. + The tests previously passed because they were accidentally run using Python 2. + * Tue Jan 27 2015 Michel Alexandre Salim - 1.1.3-10 - Clean up python3-sphinx's locale files, they ended up in the python2 package. Share the locale files in /usr/share instead