Update Sphinx config patch to also work with Sphinx 1.1.

epel8
Thomas Moschny 9 years ago
parent f78443958d
commit 8a300961b6

@ -1,13 +1,17 @@
diff -up waf-1.8.15/docs/sphinx/conf.py.orig waf-1.8.15/docs/sphinx/conf.py diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
--- waf-1.8.15/docs/sphinx/conf.py.orig 2015-10-20 09:27:38.787867271 +0200 index 275fbcc..59a3214 100644
+++ waf-1.8.15/docs/sphinx/conf.py 2015-10-24 12:29:30.497809066 +0200 --- a/docs/sphinx/conf.py
@@ -396,7 +396,11 @@ pygments_style = 'sphinx' +++ b/docs/sphinx/conf.py
@@ -396,7 +396,14 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for # The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes. # a list of builtin themes.
-html_theme = 'classic' -html_theme = 'classic'
+from sphinx import version_info +try:
+if (1, 3) <= version_info: + from sphinx import version_info
+except ImportError:
+ version_info = None
+if version_info and (1, 3) <= version_info:
+ html_theme = 'classic' + html_theme = 'classic'
+else: +else:
+ html_theme = 'default' + html_theme = 'default'

@ -14,7 +14,7 @@
Name: waf Name: waf
Version: 1.8.15 Version: 1.8.15
Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist} Release: %{?prerel:0.}2%{?prerel:.%prerel}%{?dist}
Summary: A Python-based build system Summary: A Python-based build system
Group: Development/Tools Group: Development/Tools
# The entire source code is BSD apart from pproc.py (taken from Python 2.5) # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@ -212,6 +212,9 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog %changelog
* Sat Oct 24 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.15-2
- Update Sphinx config patch to also work with Sphinx 1.1.
* Sat Oct 24 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.15-1 * Sat Oct 24 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.15-1
- Update to 1.8.15. - Update to 1.8.15.

Loading…
Cancel
Save