Update to 1.5.1

.gitignore

@@ -5,3 +5,4 @@
 /Sphinx-1.4.6.tar.gz
 /Sphinx-1.4.8.tar.gz
 /Sphinx-1.4.9.tar.gz
+/Sphinx-1.5.1.tar.gz

python-sphinx-xapian.patch

@@ -0,0 +1,34 @@
+From cf795894b9290c5ab2035ae21535f0a7f4b7107a Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Fri, 16 Dec 2016 19:44:27 +0900
+Subject: [PATCH] Fix #3246: xapian search adapter crashes
+
+---
+ CHANGES                                  | 2 ++
+ sphinx/websupport/search/xapiansearch.py | 6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/sphinx/websupport/search/xapiansearch.py b/sphinx/websupport/search/xapiansearch.py
+index 1e43dcb..aa7cff8 100644
+--- a/sphinx/websupport/search/xapiansearch.py
++++ b/sphinx/websupport/search/xapiansearch.py
+@@ -39,16 +39,16 @@ def finish_indexing(self):
+         # Ensure the db lock is removed.
+         del self.database
+ 
+-    def add_document(self, path, title, text):
++    def add_document(self, pagename, filename, title, text):
+         self.database.begin_transaction()
+         # sphinx_page_path is used to easily retrieve documents by path.
+-        sphinx_page_path = '"sphinxpagepath%s"' % path.replace('/', '_')
++        sphinx_page_path = '"sphinxpagepath%s"' % pagename.replace('/', '_')
+         # Delete the old document if it exists.
+         self.database.delete_document(sphinx_page_path)
+ 
+         doc = xapian.Document()
+         doc.set_data(text)
+-        doc.add_value(self.DOC_PATH, path)
++        doc.add_value(self.DOC_PATH, pagename)
+         doc.add_value(self.DOC_TITLE, title)
+         self.indexer.set_document(doc)
+         self.indexer.index_text(text)

python-sphinx.spec

@@ -14,8 +14,8 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.4.9
-Release:    2%{?dist}
+Version:    1.5.1
+Release:    1%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -32,6 +32,9 @@ Source2:    python3-sphinx
 Source3:    zz-modules-python-sphinx.sh
 Source4:    zz-modules-python-sphinx.csh
 #Patch0:     Sphinx-1.2.1-mantarget.patch
+# Upstream fix for xapian 1.4
+# https://github.com/sphinx-doc/sphinx/commit/cf795894b9290c5ab2035ae21535f0a7f4b7107a
+Patch1:     python-sphinx-xapian.patch
 
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
@@ -531,6 +534,9 @@ popd
 
 
 %changelog
+* Fri Dec 30 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-1
+- Update to 1.5.1
+
 * Fri Dec 30 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.9-2
 - Remove alternatives.  Alternatives should only be used for a very small
   number of packages (system daemons which also have a compatible command line

sources

@@ -1 +1 @@
-SHA512 (Sphinx-1.4.9.tar.gz) = 8dd16fc947a59a1fadb0b00f0f6a83a4dd1321569cdb86a96d68f6f9c9acb85d5fa234ffde1a986b95346569b166a90647cc5e9b64516bc184ebad932b1c0156
+SHA512 (Sphinx-1.5.1.tar.gz) = ec06998921663c0e01096743c7908131b6173ace42373eea8a95a3e24706db119eaf3eb096a70e12ecb5a4a135ee599abdf36c53f786bd392a32fdad45438794