[python-sphinx/f20] Complete LaTeX builder deps (fixes bz#882166)
Michel Alexandre Salim
salimma at fedoraproject.org
Thu Feb 5 13:19:32 UTC 2015
commit 788fd78162fe00dc9014e8937c3f92dbad980795
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Thu Feb 5 19:13:59 2015 +0700
Complete LaTeX builder deps (fixes bz#882166)
- Make test output verbose
- Add BRs needed to enable all tests
Sphinx-1.1.3-verbosetests.patch | 8 +++
python-sphinx.spec | 112 ++++++++++++++++++++++++++++++---------
2 files changed, 94 insertions(+), 26 deletions(-)
---
diff --git a/Sphinx-1.1.3-verbosetests.patch b/Sphinx-1.1.3-verbosetests.patch
new file mode 100644
index 0000000..c0911d4
--- /dev/null
+++ b/Sphinx-1.1.3-verbosetests.patch
@@ -0,0 +1,8 @@
+--- Sphinx-1.1.3/tests/run.py.verbosetests 2012-03-11 00:57:39.000000000 +0700
++++ Sphinx-1.1.3/tests/run.py 2015-02-05 19:54:51.887215463 +0700
+@@ -47,4 +47,4 @@
+ sys.exit(1)
+
+ print('Running Sphinx test suite...')
+-nose.main()
++nose.main(argv=['nose', '--verbosity=3'])
diff --git a/python-sphinx.spec b/python-sphinx.spec
index d432d23..c8fcfe6 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -31,15 +31,35 @@ Patch0: sphinx-docutils-0.10.patch
# Fixes quoting issue in inheritance_diagram.py
# Already applied upstream as part of https://bitbucket.org/birkenfeld/sphinx/commits/fc1db93d21a5a535d9d62e5a0c9f0a806a8c117a
Patch1: Sphinx-1.1.3-fix_quoting_in_inheritance.patch
+Patch2: Sphinx-1.1.3-verbosetests.patch
BuildArch: noarch
BuildRequires: python2-devel >= 2.4
BuildRequires: python-setuptools
BuildRequires: python-docutils
BuildRequires: python-jinja2
+BuildRequires: python-pygments
+
+# for testing
BuildRequires: python-nose
-# Test dependencies
-BuildRequires: texlive-latex
+BuildRequires: gettext
+BuildRequires: texinfo
+BuildRequires: python-sqlalchemy
+BuildRequires: python-whoosh
+# note: no Python3 xapian binding yet
+BuildRequires: xapian-bindings-python
+BuildRequires: texlive-collection-fontsrecommended
+BuildRequires: texlive-collection-latex
+BuildRequires: tex(cmap.sty)
+BuildRequires: tex(ecrm1000.tfm)
+BuildRequires: tex(fancybox.sty)
+BuildRequires: tex(footnote.sty)
+BuildRequires: tex(framed.sty)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(parskip.sty)
+BuildRequires: tex(titlesec.sty)
+BuildRequires: tex(threeparttable.sty)
+BuildRequires: tex(wrapfig.sty)
%if 0%{?with_python3}
BuildRequires: python3-devel
@@ -48,6 +68,8 @@ BuildRequires: python3-docutils
BuildRequires: python3-jinja2
BuildRequires: python3-pygments
BuildRequires: python3-nose
+BuildRequires: python3-sqlalchemy
+BuildRequires: python3-whoosh
%endif # with_python3
Requires: python-docutils
@@ -55,10 +77,18 @@ Requires: python-jinja2
Requires: python-pygments
%if ! 0%{?with_splitlatex}
Provides: %{name}-latex = %{version}-%{release}
-Requires: texlive-framed
-Requires: texlive-threeparttable
-Requires: texlive-titlesec
-Requires: texlive-wrapfig
+Requires: texlive-collection-fontsrecommended
+Requires: texlive-collection-latex
+Requires: tex(cmap.sty)
+Requires: tex(ecrm1000.tfm)
+Requires: tex(fancybox.sty)
+Requires: tex(footnote.sty)
+Requires: tex(framed.sty)
+Requires: tex(multirow.sty)
+Requires: tex(parskip.sty)
+Requires: tex(titlesec.sty)
+Requires: tex(threeparttable.sty)
+Requires: tex(wrapfig.sty)
%endif
%description
@@ -92,12 +122,20 @@ the Python docs:
%if 0%{?with_splitlatex}
%package latex
-Summary: LaTeX builder for %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: texlive-framed
-Requires: texlive-threeparttable
-Requires: texlive-titlesec
-Requires: texlive-wrapfig
+Summary: LaTeX builder for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: texlive-collection-fontsrecommended
+Requires: texlive-collection-latex
+Requires: tex(cmap.sty)
+Requires: tex(ecrm1000.tfm)
+Requires: tex(fancybox.sty)
+Requires: tex(footnote.sty)
+Requires: tex(framed.sty)
+Requires: tex(multirow.sty)
+Requires: tex(parskip.sty)
+Requires: tex(titlesec.sty)
+Requires: tex(threeparttable.sty)
+Requires: tex(wrapfig.sty)
%description latex
Sphinx is a tool that makes it easy to create intelligent and
@@ -115,17 +153,25 @@ dependencies.
%if 0%{?with_python3}
%package -n python3-sphinx
-Summary: Python documentation generator
-Group: Development/Tools
+Summary: Python documentation generator
+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
+Requires: texlive-collection-fontsrecommended
+Requires: texlive-collection-latex
+Requires: tex(cmap.sty)
+Requires: tex(ecrm1000.tfm)
+Requires: tex(fancybox.sty)
+Requires: tex(footnote.sty)
+Requires: tex(framed.sty)
+Requires: tex(multirow.sty)
+Requires: tex(parskip.sty)
+Requires: tex(titlesec.sty)
+Requires: tex(threeparttable.sty)
+Requires: tex(wrapfig.sty)
%endif
%description -n python3-sphinx
@@ -158,12 +204,20 @@ the Python docs:
%if 0%{?with_splitlatex}
%package -n python3-sphinx-latex
-Summary: LaTeX builder for %{name}
-Requires: python3-sphinx = %{version}-%{release}
-Requires: texlive-framed
-Requires: texlive-threeparttable
-Requires: texlive-titlesec
-Requires: texlive-wrapfig
+Summary: LaTeX builder for %{name}
+Requires: python3-sphinx = %{version}-%{release}
+Requires: texlive-collection-fontsrecommended
+Requires: texlive-collection-latex
+Requires: tex(cmap.sty)
+Requires: tex(ecrm1000.tfm)
+Requires: tex(fancybox.sty)
+Requires: tex(footnote.sty)
+Requires: tex(framed.sty)
+Requires: tex(multirow.sty)
+Requires: tex(parskip.sty)
+Requires: tex(titlesec.sty)
+Requires: tex(threeparttable.sty)
+Requires: tex(wrapfig.sty)
%description -n python3-sphinx-latex
Sphinx is a tool that makes it easy to create intelligent and
@@ -203,6 +257,7 @@ sed '1d' -i sphinx/pycode/pgen2/token.py
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%if 0%{?with_python3}
rm -rf %{py3dir}
@@ -291,13 +346,13 @@ popd
%check
-make test
+LANG=en_US.UTF-8 make test
%if 0%{?with_python3}
pushd %{py3dir}
# 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
+LANG=en_US.UTF-8 PYTHON=python3 make test || true
popd
%endif # with_python3
@@ -361,6 +416,11 @@ popd
%changelog
+* Thu Feb 5 2015 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.1.3-12
+- Complete LaTeX builder deps (fixes bz#882166)
+- Make test output verbose
+- Add BRs needed to enable all tests
+
* Tue Feb 3 2015 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.1.3-11
- If a separate LaTeX subpackage is not generated, the main package should have
a virtual Provides: for it (bz#1187989)
More information about the scm-commits
mailing list