From 8a300961b62ff94737995f5739347e5ff9b55b61 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Sat, 24 Oct 2015 15:31:17 +0200
Subject: [PATCH] Update Sphinx config patch to also work with Sphinx 1.1.

---
 waf-1.8.15-sphinx-theme.patch | 16 ++++++++++------
 waf.spec                      |  5 ++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/waf-1.8.15-sphinx-theme.patch b/waf-1.8.15-sphinx-theme.patch
index a523524..115f3be 100644
--- a/waf-1.8.15-sphinx-theme.patch
+++ b/waf-1.8.15-sphinx-theme.patch
@@ -1,13 +1,17 @@
-diff -up waf-1.8.15/docs/sphinx/conf.py.orig waf-1.8.15/docs/sphinx/conf.py
---- waf-1.8.15/docs/sphinx/conf.py.orig	2015-10-20 09:27:38.787867271 +0200
-+++ waf-1.8.15/docs/sphinx/conf.py	2015-10-24 12:29:30.497809066 +0200
-@@ -396,7 +396,11 @@ pygments_style = 'sphinx'
+diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
+index 275fbcc..59a3214 100644
+--- a/docs/sphinx/conf.py
++++ 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
  # a list of builtin themes.
 -html_theme = 'classic'
-+from sphinx import version_info
-+if (1, 3) <= version_info:
++try:
++	from sphinx import version_info
++except ImportError:
++	version_info = None
++if version_info and (1, 3) <= version_info:
 +	html_theme = 'classic'
 +else:
 +	html_theme = 'default'
diff --git a/waf.spec b/waf.spec
index 2485ec8..10f08fc 100644
--- a/waf.spec
+++ b/waf.spec
@@ -14,7 +14,7 @@
 
 Name:           waf
 Version:        1.8.15
-Release:        %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
+Release:        %{?prerel:0.}2%{?prerel:.%prerel}%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # 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
+* 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
 - Update to 1.8.15.