From c7debf9dce96fd6bf02641b6ebb08a9b95296ca6a8803845d786047342a54df5 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 24 Aug 2017 16:44:23 +0000 Subject: [PATCH] Accepting request 518572 from home:TheBlackCat:branches:devel:languages:python This fixes build errors in various python-foo-doc packages. - Add new latex dependencies needed in openSUSE:Factory - Check that latex dependencies are installable OBS-URL: https://build.opensuse.org/request/show/518572 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=87 --- python-Sphinx-doc.changes | 5 +++++ python-Sphinx-doc.spec | 8 ++++++++ python-Sphinx.changes | 5 +++++ python-Sphinx.spec | 9 +++++++-- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/python-Sphinx-doc.changes b/python-Sphinx-doc.changes index ace1327..1365757 100644 --- a/python-Sphinx-doc.changes +++ b/python-Sphinx-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 24 16:43:14 UTC 2017 - toddrme2178@gmail.com + +- Check that latex dependencies are installable + ------------------------------------------------------------------- Mon Jul 24 19:11:52 UTC 2017 - toddrme2178@gmail.com diff --git a/python-Sphinx-doc.spec b/python-Sphinx-doc.spec index 47bf870..8ac83dd 100644 --- a/python-Sphinx-doc.spec +++ b/python-Sphinx-doc.spec @@ -15,6 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} != 1315 +%bcond_without latex +%else +%bcond_with latex +%endif %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Sphinx-doc @@ -29,6 +34,9 @@ Patch1: disable-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: python3-Sphinx +%if %{with latex} +BuildRequires: python3-Sphinx-latex +%endif BuildRequires: python-rpm-macros Recommends: %{name}-html = %{version} BuildArch: noarch diff --git a/python-Sphinx.changes b/python-Sphinx.changes index ace1327..30f33a0 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 24 15:55:01 UTC 2017 - toddrme2178@gmail.com + +- Add new latex dependencies needed in openSUSE:Factory + ------------------------------------------------------------------- Mon Jul 24 19:11:52 UTC 2017 - toddrme2178@gmail.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 0f38a14..f5e68e5 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -1,5 +1,5 @@ # -# spec file for package python-Sphinx-doc +# spec file for package python-Sphinx # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # -%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) +%if 0%{?suse_version} != 1315 %bcond_without latex %else %bcond_with latex @@ -153,6 +153,11 @@ Requires: tex(upquote.sty) Requires: tex(utf8.def) Requires: tex(utf8x.def) Requires: tex(wrapfig.sty) +%if 0%{?suse_version} > 1320 +Requires: texlive-latexmk +Requires: texlive-makeindex +Requires: tex(varwidth.sty) +%endif %description latex Sphinx is a tool that makes it easy to create intelligent and beautiful