Fix a crash on parallel building. (rhbz#1494276)

builddir => buildroot
Just make the changelog a little clearer
2017-09-22 13:00:15 +02:00 · 2017-02-18 10:09:43 -08:00 · 2017-02-18 10:04:23 -08:00 · 2017-02-18 09:53:25 -08:00 · 2017-02-17 11:26:15 -08:00 · 2017-02-17 11:04:35 -08:00
8 changed files with 449 additions and 540 deletions
@@ -1,45 +1 @@
-/Sphinx-1.2.3.tar.gz
-/Sphinx-1.3.1.tar.gz
-/Sphinx-1.4.4.tar.gz
-/Sphinx-1.4.5.tar.gz
-/Sphinx-1.4.6.tar.gz
-/Sphinx-1.4.8.tar.gz
-/Sphinx-1.4.9.tar.gz
-/Sphinx-1.5.1.tar.gz
 /Sphinx-1.5.2.tar.gz
-/Sphinx-1.6.3.tar.gz
-/Sphinx-1.6.4.tar.gz
-/Sphinx-1.6.5.tar.gz
-/Sphinx-1.6.6.tar.gz
-/Sphinx-1.7.1.tar.gz
-/Sphinx-1.7.2.tar.gz
-/Sphinx-1.7.5.tar.gz
-/Sphinx-1.7.6.tar.gz
-/Sphinx-1.8.4.tar.gz
-/Sphinx-2.0.0b1.tar.gz
-/Sphinx-2.0.0b2.tar.gz
-/Sphinx-2.0.1.tar.gz
-/Sphinx-2.1.2.tar.gz
-/Sphinx-2.2.0.tar.gz
-/Sphinx-2.2.2.tar.gz
-/Sphinx-3.1.1.tar.gz
-/Sphinx-3.1.2.tar.gz
-/Sphinx-3.2.1.tar.gz
-/Sphinx-3.3.1.tar.gz
-/Sphinx-3.4.3.tar.gz
-/Sphinx-3.5.2.tar.gz
-/Sphinx-3.5.3.tar.gz
-/Sphinx-3.5.4.tar.gz
-/Sphinx-4.0.2.tar.gz
-/Sphinx-4.1.2.tar.gz
-/Sphinx-4.2.0.tar.gz
-/Sphinx-4.3.0.tar.gz
-/Sphinx-4.3.1.tar.gz
-/Sphinx-4.4.0.tar.gz
-/Sphinx-4.5.0.tar.gz
-/Sphinx-5.0.2.tar.gz
-/Sphinx-5.1.1.tar.gz
-/Sphinx-5.2.3.tar.gz
-/Sphinx-5.3.0.tar.gz
-/Sphinx-6.1.3.tar.gz
-/Sphinx-6.2.1.tar.gz
@@ -0,0 +1,15 @@
+--- sphinx/doc/Makefile.mantarget	2014-02-13 23:28:58.604797750 +0700
+++ sphinx/doc/Makefile	2014-02-14 00:00:45.794658764 +0700
+@@ -12,6 +12,12 @@
+ help:
+ 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+ 
+# Likewise for man, since a man directory exist and make will assume
+# the target is up to date
+.PHONY: man
+man:
+	@$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+ # Catch-all target: route all unknown targets to Sphinx using the new
+ # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+ %:
@@ -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:
@@ -0,0 +1,21 @@
+diff --git Sphinx-1.3.1/sphinx/builders/linkcheck.py~ Sphinx-1.3.1/sphinx/builders/linkcheck.py
+index 9f5c2131c2..71bec0262d 100644
+--- Sphinx-1.3.1/sphinx/builders/linkcheck.py~
+++ Sphinx-1.3.1/sphinx/builders/linkcheck.py
+@@ -19,9 +19,15 @@ from six.moves import queue
+ from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler
+ from six.moves.urllib.parse import unquote, urlsplit, quote
+ from six.moves.urllib.error import HTTPError
+-from six.moves.html_parser import HTMLParser, HTMLParseError
+from six.moves.html_parser import HTMLParser
+ from docutils import nodes
+ 
+try:
+    from HTMLParser import HTMLParseError
+except ImportError:
+    class HTMLParseError(Exception):
+        pass
+
+ from sphinx.builders import Builder
+ from sphinx.util.console import purple, red, darkgreen, darkgray, \
+     darkred, turquoise
@@ -1,4 +0,0 @@
-# exclude XML template (not always valid) from XML validity check:
-xml:
-    ignore:
-        - /usr/lib/python*/site-packages/sphinx/themes/basic/opensearch.xml
@@ -1 +1 @@
-SHA512 (Sphinx-6.2.1.tar.gz) = 88daae1f9bacbf513c0db1e7d732104b00ac36803b82e253d14eda287b4d48cfa34d0ed90b13099748610f405dc8bdcc54c2d33002a27b970117baf93418a062
+SHA512 (Sphinx-1.5.2.tar.gz) = 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88
@@ -1,12 +0,0 @@
-diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py
--- Sphinx-1.7.6/tests/test_theming.py	2018-07-16 11:24:40.000000000 +0200
-+++ Sphinx-1.7.6_patched/tests/test_theming.py	2018-07-20 15:17:35.049263077 +0200
-@@ -25,7 +25,7 @@
-         themes.append('alabaster')
- 
-     # test Theme class API
-    assert set(app.registry.html_themes.keys()) == set(themes)
-+    assert set(app.registry.html_themes.keys()) >= set(themes)
-     assert app.registry.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
-     assert app.registry.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
-     assert app.registry.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'
Author	SHA1	Message	Date
Charalampos Stratakis	411dc9d6f4	Fix a crash on parallel building. (rhbz#1494276)	2017-09-22 13:00:15 +02:00
Toshio Kuratomi	d868b07963	builddir => buildroot	2017-02-18 10:09:43 -08:00
Toshio Kuratomi	19b3b5089d	Just make the changelog a little clearer	2017-02-18 10:04:23 -08:00
Toshio Kuratomi	a3d3cf9a8e	Assign %attrs to %ghosted files so that rpm knows what permissions they should have. Cleanup source files that should not be installed Fix the __init__	2017-02-18 09:53:25 -08:00
Toshio Kuratomi	ddc17e4a62	Disable checks. The tests require pytest >= 3.0 and we only have pytest-2.9.2 on F25	2017-02-17 11:26:15 -08:00
Fedora Release Engineering	7734c3da73	- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild (cherry picked from commit `9ea173bb1e`) Update to 1.5.2 Remove a few latex dependencies that are no longer needed (cherry picked from commit `5bf198167c`) Remember to update the source tarball as well (cherry picked from commit `145cab2c32`) Xapian patch no longer needed (cherry picked from commit `b5d98f0f4d`) Add more buildrequires for tests (cherry picked from commit `f73229b3b1`) Modify changelog dates for the merged revisions	2017-02-17 11:04:35 -08:00
Toshio Kuratomi	0389475b57	Update release number. The reverts also changed the release number	2017-01-18 23:36:46 -08:00
Toshio Kuratomi	2cd4bbf695	Change alternatives priority so that the python2 version gets the default to follow Fedora policy.	2017-01-18 23:35:45 -08:00
Toshio Kuratomi	ad4e37d123	Revert "Remove alternatives. Alternatives should only be used for a very small" This reverts commit `ad8724f17a`. aviso doesn't want to switch technologies in the middle of a stable release	2017-01-18 23:29:44 -08:00
Toshio Kuratomi	c14bc12e0c	Revert "Add environment-module related files" This reverts commit `68944a5bb0`. Aviso doesn't want to change technologies for switching in the middle of a stable release	2017-01-18 23:29:07 -08:00