From 411dc9d6f4baa6d5498e4444612ab1f38b81a414 Mon Sep 17 00:00:00 2001
From: Charalampos Stratakis <cstratak@redhat.com>
Date: Fri, 22 Sep 2017 13:00:15 +0200
Subject: [PATCH] Fix a crash on parallel building. (rhbz#1494276)

---
 fix-crash-on-parallel-build.patch | 12 ++++++++++++
 python-sphinx.spec                | 12 +++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 fix-crash-on-parallel-build.patch

diff --git a/fix-crash-on-parallel-build.patch b/fix-crash-on-parallel-build.patch
new file mode 100644
index 0000000..9bf01c7
--- /dev/null
+++ b/fix-crash-on-parallel-build.patch
@@ -0,0 +1,12 @@
+diff --git a/sphinx/util/parallel.py b/sphinx/util/parallel.py
+index ce51ac0..64f9bc1 100644
+--- a/sphinx/util/parallel.py
++++ b/sphinx/util/parallel.py
+@@ -100,6 +100,7 @@ class ParallelTasks(object):
+                     raise SphinxParallelError(*result)
+                 self._result_funcs.pop(tid)(self._args.pop(tid), result)
+                 self._procs[tid].join()
++                self._precvs.pop(tid)
+                 self._pworking -= 1
+                 break
+         else:
diff --git a/python-sphinx.spec b/python-sphinx.spec
index e92f2b4..394cd8c 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -15,7 +15,7 @@
 
 Name:       python-sphinx
 Version:    1.5.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -28,6 +28,13 @@ License:    BSD and Public Domain and Python and (MIT or GPLv2)
 URL:        http://sphinx-doc.org/
 Source0:    https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
 
+# Backport of a bugfix from the 1.6 upstream branch of sphinx
+# to address a crash with parallel building.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1494276
+# Upstream commit:
+# https://github.com/sphinx-doc/sphinx/pull/4039/commits/0cb57f19a099be2809a8fb5dc9274f7411e1caac
+Patch0: fix-crash-on-parallel-build.patch
+
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
 BuildRequires: python2-babel
@@ -567,6 +574,9 @@ fi
 
 
 %changelog
+* Fri Sep 22 2017 Charalampos Stratakis <cstratak@redhat.com> - 1.5.2-3
+- Fix a crash on parallel build.
+
 * Sat Feb 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-2
 - Assign %%attrs to %%ghosted files so that rpm knows what permissions they
   should have.