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

should have.
Cleanup source files that should not be installed
Fix the __init__

.gitignore

@@ -1 +1 @@
-/Sphinx-1.1.3.tar.gz
+/Sphinx-1.5.2.tar.gz

Sphinx-1.1.3-fix_quoting_in_inheritance.patch

@@ -1,13 +0,0 @@
---- Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py.orig	2012-02-19 11:54:47.000000000 +0100
-+++ Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py	2013-03-02 18:44:29.303047600 +0100
-@@ -199,8 +199,8 @@ class InheritanceGraph(object):
-         'shape': 'box',
-         'fontsize': 10,
-         'height': 0.25,
--        'fontname': 'Vera Sans, DejaVu Sans, Liberation Sans, '
--                    'Arial, Helvetica, sans',
-+        'fontname': '"Vera Sans, DejaVu Sans, Liberation Sans, '
-+                    'Arial, Helvetica, sans"',
-         'style': '"setlinewidth(0.5)"',
-     }
-     default_edge_attrs = {

Sphinx-1.2.1-mantarget.patch

@@ -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).
+ %:

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:

html-parser-HTMLParserError-removed.patch

@@ -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

python-sphinx.spec

@@ -1,15 +1,21 @@
 %if 0%{?fedora}
 %global with_python3 1
-%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")}
 %else
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
+# Currently Fedora policy is that the python2 version is the default version
+%if 0
+%global py3_alt_priority 500
+%else
+%global py3_alt_priority 10
+%endif
+
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.1.3
-Release:    8%{?dist}
+Version:    1.5.2
+Release:    3%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -19,36 +25,106 @@ Group:      Development/Tools
 # sphinx/pycode/pgen2 Python
 # jquery (MIT or GPLv2)
 License:    BSD and Public Domain and Python and (MIT or GPLv2)
-URL:        http://sphinx.pocoo.org/
-Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
-# Sent upstream as a fix to work with the next version of docutils
-# https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage
-Patch0: sphinx-docutils-0.10.patch
-# Fixes quoting issue in inheritance_diagram.py
-# Already applied upstream as part of https://bitbucket.org/birkenfeld/sphinx/commits/fc1db93d21a5a535d9d62e5a0c9f0a806a8c117a
-Patch1: Sphinx-1.1.3-fix_quoting_in_inheritance.patch
+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: python-setuptools
+BuildRequires: python2-babel
+BuildRequires: python2-setuptools
 BuildRequires: python-docutils
 BuildRequires: python-jinja2
+BuildRequires: python-pygments >= 2.0
+BuildRequires: python-six
+BuildRequires: python2-sphinx_rtd_theme
+BuildRequires: python2-sphinx-theme-alabaster
+BuildRequires: python2-imagesize
+BuildRequires: python2-requests
+BuildRequires: environment(modules)
+
+# for fixes
+BuildRequires: dos2unix
+
+# for testing
 BuildRequires: python-nose
-# Test dependencies
-BuildRequires: texlive-latex
+BuildRequires: python2-pytest
+BuildRequires: python-pytest-cov
+BuildRequires: gettext
+BuildRequires: texinfo
+BuildRequires: graphviz
+BuildRequires: python-sqlalchemy
+BuildRequires: python2-mock
+BuildRequires: python2-simplejson
+BuildRequires: python-html5lib
+BuildRequires: python-whoosh
+BuildRequires: python2-snowballstemmer
+BuildRequires: python-enum34
+# note: no Python3 xapian binding yet
+BuildRequires: xapian-bindings-python
+BuildRequires: texlive-collection-fontsrecommended
+BuildRequires: texlive-collection-latex
+BuildRequires: texlive-dvipng
+BuildRequires: texlive-dvisvgm
+BuildRequires: texlive-ucs
+BuildRequires: tex(cmap.sty)
+BuildRequires: tex(ecrm1000.tfm)
+BuildRequires: tex(footnote.sty)
+BuildRequires: tex(framed.sty)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(parskip.sty)
+BuildRequires: tex(titlesec.sty)
+BuildRequires: tex(threeparttable.sty)
+BuildRequires: tex(upquote.sty)
+BuildRequires: tex(wrapfig.sty)
+BuildRequires: tex(capt-of.sty)
+BuildRequires: tex(needspace.sty)
+BuildRequires: tex(eqparbox.sty)
+BuildRequires: tex(amsmath.sty)
+BuildRequires: tex(amsthm.sty)
+BuildRequires: tex(amssymb.sty)
+BuildRequires: tex(amsfonts.sty)
+BuildRequires: tex(bm.sty)
+BuildRequires: tex(palatino.sty)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(eqparbox.sty)
+BuildRequires: tex(atbegshi.sty)
+BuildRequires: tex(anyfontsize.sty)
+BuildRequires: tex(luatex85.sty)
+BuildRequires: tex(fncychap.sty)
+BuildRequires: tex(tabulary.sty)
+BuildRequires: tex(polyglossia.sty)
+BuildRequires: tex(eu1enc.def)
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
+BuildRequires: python3-babel
 BuildRequires: python3-setuptools
 BuildRequires: python3-docutils
 BuildRequires: python3-jinja2
 BuildRequires: python3-pygments
 BuildRequires: python3-nose
+BuildRequires: python3-pytest
+BuildRequires: python3-pytest-cov
+BuildRequires: python3-sqlalchemy
+BuildRequires: python3-mock
+BuildRequires: python3-simplejson
+BuildRequires: python3-html5lib
+BuildRequires: python3-whoosh
+BuildRequires: python3-snowballstemmer
+BuildRequires: python3-six
+BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: python3-sphinx-theme-alabaster
+BuildRequires: python3-imagesize
+BuildRequires: python3-requests
 %endif # with_python3
 
-Requires:      python-docutils
-Requires:      python-jinja2
-Requires:      python-pygments
 
 %description
 Sphinx is a tool that makes it easy to create intelligent and
@@ -79,13 +155,135 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
+%package -n    python2-sphinx
+Summary:       Python documentation generator
+Requires:      python-sphinx-locale = %{version}-%{release}
+Requires:      python2-babel
+Requires:      python-docutils
+Requires:      python-jinja2
+Requires:      python-pygments
+Requires:      python2-mock
+Requires:      python2-snowballstemmer
+Requires:      python2-sphinx_rtd_theme
+Requires:      python2-six
+Requires:      python2-sphinx-theme-alabaster
+Requires:      python2-imagesize
+Requires:      python2-requests
+Recommends:    graphviz
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
+Obsoletes:     python-sphinx <= 1.2.3
+Obsoletes:     python-sphinxcontrib-napoleon < 0.5
+Provides:      python-sphinxcontrib-napoleon = %{version}-%{release}
+Obsoletes:     python2-Sphinx <= 1.3.1-4
+Provides:      python2-Sphinx = %{version}-%{release}
+Provides:      python(Sphinx) = %{version}-%{release}
+%{?python_provide:%python_provide python2-sphinx}
+Conflicts:     python3-sphinx < %{version}-%{release}
+
+%description -n python2-sphinx
+Sphinx is a tool that makes it easy to create intelligent and
+beautiful documentation for Python projects (or other documents
+consisting of multiple reStructuredText sources), written by Georg
+Brandl. It was originally created to translate the new Python
+documentation, but has now been cleaned up in the hope that it will be
+useful to many other projects.
+
+Sphinx uses reStructuredText as its markup language, and many of its
+strengths come from the power and straightforwardness of
+reStructuredText and its parsing and translating suite, the Docutils.
+
+Although it is still under constant development, the following
+features are already present, work fine and can be seen "in action" in
+the Python docs:
+
+    * Output formats: HTML (including Windows HTML Help) and LaTeX,
+      for printable PDF versions
+    * Extensive cross-references: semantic markup and automatic links
+      for functions, classes, glossary terms and similar pieces of
+      information
+    * Hierarchical structure: easy definition of a document tree, with
+      automatic links to siblings, parents and children
+    * Automatic indices: general index as well as a module index
+    * Code handling: automatic highlighting using the Pygments highlighter
+    * Various extensions are available, e.g. for automatic testing of
+      snippets and inclusion of appropriately formatted docstrings.
+
+
+%package latex
+Summary:       LaTeX builder dependencies for %{name}
+Requires:      python(Sphinx) = %{version}-%{release}
+Requires:      texlive-collection-fontsrecommended
+Requires:      texlive-collection-latex
+Requires:      texlive-dvipng
+Requires:      texlive-dvisvgm
+Requires:      texlive-ucs
+Requires:      tex(cmap.sty)
+Requires:      tex(ecrm1000.tfm)
+Requires:      tex(footnote.sty)
+Requires:      tex(framed.sty)
+Requires:      tex(multirow.sty)
+Requires:      tex(parskip.sty)
+Requires:      tex(titlesec.sty)
+Requires:      tex(threeparttable.sty)
+Requires:      tex(upquote.sty)
+Requires:      tex(wrapfig.sty)
+Requires:      tex(capt-of.sty)
+Requires:      tex(needspace.sty)
+Requires:      tex(eqparbox.sty)
+Requires:      tex(amsmath.sty)
+Requires:      tex(amsthm.sty)
+Requires:      tex(amssymb.sty)
+Requires:      tex(amsfonts.sty)
+Requires:      tex(bm.sty)
+Requires:      tex(palatino.sty)
+Requires:      tex(multirow.sty)
+Requires:      tex(eqparbox.sty)
+Requires:      tex(atbegshi.sty)
+Requires:      tex(anyfontsize.sty)
+Requires:      tex(luatex85.sty)
+Requires:      tex(fncychap.sty)
+Requires:      tex(tabulary.sty)
+Requires:      tex(polyglossia.sty)
+Requires:      tex(eu1enc.def)
+Obsoletes:     python3-sphinx-latex < 1.4.4-2
+
+%description latex
+Sphinx is a tool that makes it easy to create intelligent and
+beautiful documentation for Python projects (or other documents
+consisting of multiple reStructuredText sources), written by Georg
+Brandl. It was originally created to translate the new Python
+documentation, but has now been cleaned up in the hope that it will be
+useful to many other projects.
+
+This package pulls in the TeX dependencies needed by Sphinx's LaTeX
+builder.
+
+
 %if 0%{?with_python3}
 %package -n python3-sphinx
-Summary:    Python documentation generator
-Group:      Development/Tools
+Summary:       Python documentation generator
+Group:         Development/Tools
+Requires:      python-sphinx-locale = %{version}-%{release}
+Requires:      python3-babel
 Requires:      python3-docutils
 Requires:      python3-jinja2
 Requires:      python3-pygments
+Requires:      python3-mock
+Requires:      python3-snowballstemmer
+Requires:      python3-sphinx_rtd_theme
+Requires:      python3-sphinx-theme-alabaster
+Requires:      python3-imagesize
+Requires:      python3-requests
+Requires:      python3-six
+Recommends:    graphviz
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
+Obsoletes:     python3-sphinxcontrib-napoleon < 0.3.0
+Provides:      python3-sphinxcontrib-napoleon = %{version}-%{release}
+Provides:      python(Sphinx) = %{version}-%{release}
+%{?python_provide:%python_provide python3-sphinx}
+Conflicts:     python2-Sphinx < %{version}-%{release}
 
 %description -n python3-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -118,11 +316,10 @@ the Python docs:
 
 
 %package doc
-Summary:    Documentation for %{name}
-Group:      Documentation
-License:    BSD
-Requires:   %{name} = %{version}-%{release}
-
+Summary:       Documentation for %{name}
+Group:         Documentation
+License:       BSD
+Requires:      python(Sphinx) = %{version}-%{release}
 
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -135,12 +332,32 @@ useful to many other projects.
 This package contains documentation in reST and HTML formats.
 
 
+%package locale
+Summary:       Locale files for %{name}
+Group:         Development/Tools
+License:       BSD
+
+%description locale
+Sphinx is a tool that makes it easy to create intelligent and
+beautiful documentation for Python projects (or other documents
+consisting of multiple reStructuredText sources), written by Georg
+Brandl. It was originally created to translate the new Python
+documentation, but has now been cleaned up in the hope that it will be
+useful to many other projects.
+
+This package contains locale files for Sphinx
+
 %prep
-%setup -q -n %{upstream_name}-%{version}%{?prerel}
+%autosetup -n %{upstream_name}-%{version}%{?prerel} -p1
+
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
-%patch0 -p1
-%patch1 -p1
+# fix line encoding of bundled jquery.js
+dos2unix -k ./sphinx/themes/basic/static/jquery.js
+
+# In 1.5.2, the upstream tarball left this .pyc by mistake.
+# Remove it so that it doesn't get included in the python3 build by mistake
+rm sphinx/locale/__init__.pyc
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -149,11 +366,9 @@ cp -a . %{py3dir}
 
 
 %build
-%{__python} setup.py build
+%py2_build
 %if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
+%py3_build
 %endif # with_python3
 
 pushd doc
@@ -165,33 +380,49 @@ popd
 
 
 %install
-rm -rf %{buildroot}
 
-# Must do the python3 install first because the scripts in /usr/bin are
-# overwritten with every setup.py install (and we want the python2 version
-# to be the default for now).
 %if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
-for f in %{buildroot}%{_bindir}/sphinx-*;
-do
-    mv $f $f-%{python3_version}
+%py3_install
+for i in sphinx-{apidoc,autogen,build,quickstart}; do
+    mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
+    ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3
 done
-popd
+
+# These appear to be incomplete C extensions to speed up parsing.  They are not
+# built by setup.py yet.  Removing them in %%install so that if sphinx does
+# make use of them, and we don't notice, we only remove these source files
+# after the build has created the .so's
+rm %{buildroot}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c}
 %endif # with_python3
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+%py2_install
+for i in sphinx-{apidoc,autogen,build,quickstart}; do
+    mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version}
+    ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2
+done
+
+# These appear to be incomplete C extensions to speed up parsing.  They are not
+# built by setup.py yet.  Removing them in %%install so that if sphinx does
+# make use of them, and we don't notice, we only remove these source files
+# after the build has created the .so's
+rm %{buildroot}%{python2_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c}
+
+for i in sphinx-{apidoc,autogen,build,quickstart}; do
+    touch %{buildroot}%{_bindir}/$i
+done
 
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
-mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/
-%if 0%{?with_python3}
-for f in %{buildroot}%{_mandir}/man1/sphinx-*.1;
+for f in _build/man/sphinx-*.1;
 do
-    cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|")
+    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python2_version}.1|")
+    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python3_version}.1|")
 done
-%endif # with_python3
+
+# Remove language files, they're identical to the ones from the
+# Python 2 build that will be moved to /usr/share below
+find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \;
 popd
 
 # Deliver rst files
@@ -203,7 +434,7 @@ mv doc reST
 # patch to support this incorporated in 0.6.6
 pushd %{buildroot}%{python_sitelib}
 
-for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -printf "%f "`;
+for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
 do
   install -d %{buildroot}%{_datadir}/sphinx/locale/$lang
   install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
@@ -224,43 +455,268 @@ popd
 
 
 %check
-make test
+
+# Hate to disable checks but they need pytest 3.0+ in order to function
+# and we don't have that on F25.
+
+#LANG=en_US.UTF-8 make test
 %if 0%{?with_python3}
 pushd %{py3dir}
-make test
+#LANG=en_US.UTF-8 PYTHON=python3 make test
 popd
 %endif # with_python3
 
+%post -n python2-sphinx
 
-%files -f sphinx.lang
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
-%exclude %{_bindir}/sphinx-*-%{python3_version}
-%{_bindir}/sphinx-*
-%{python_sitelib}/*
+# Remove old versions of files so alternatives doesn't break
+for filename in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz %{_bindir}/sphinx-{build,apidoc,autogen,quickstart}
+do
+    if [ ! -L $filename ]
+    then
+        rm -f $filename
+    fi
+done
+
+%{_sbindir}/update-alternatives --install %{_bindir}/sphinx-build \
+  sphinx-build %{_bindir}/sphinx-build-%{python2_version} 100 \
+  --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python2_version} \
+  --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python2_version} \
+  --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python2_version} \
+  --slave %{_mandir}/man1/sphinx-all.1.gz sphinx-all.1.gz %{_mandir}/man1/sphinx-all-%{python2_version}.1.gz \
+  --slave %{_mandir}/man1/sphinx-apidoc.1.gz sphinx-apidoc.1.gz %{_mandir}/man1/sphinx-apidoc-%{python2_version}.1.gz \
+  --slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1.gz %{_mandir}/man1/sphinx-build-%{python2_version}.1.gz \
+  --slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{python2_version}.1.gz
+
+%if 0%{?with_python3}
+%post -n python3-sphinx
+
+# Remove old versions of files so alternatives doesn't break
+for filename in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz %{_bindir}/sphinx-{build,apidoc,autogen,quickstart}
+do
+    if [ ! -L $filename ]
+    then
+        rm -f $filename
+    fi
+done
+
+%{_sbindir}/update-alternatives --install %{_bindir}/sphinx-build \
+  sphinx-build %{_bindir}/sphinx-build-%{python3_version} %{py3_alt_priority} \
+  --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python3_version} \
+  --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python3_version} \
+  --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python3_version} \
+  --slave %{_mandir}/man1/sphinx-all.1.gz sphinx-all.1.gz %{_mandir}/man1/sphinx-all-%{python3_version}.1.gz \
+  --slave %{_mandir}/man1/sphinx-apidoc.1.gz sphinx-apidoc.1.gz %{_mandir}/man1/sphinx-apidoc-%{python3_version}.1.gz \
+  --slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1.gz %{_mandir}/man1/sphinx-build-%{python3_version}.1.gz \
+  --slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{python3_version}.1.gz
+%endif # with_python3
+
+%postun -n python2-sphinx
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version}
+fi
+
+%if 0%{?with_python3}
+%postun -n python3-sphinx
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version}
+fi
+%endif # with_python3
+
+%files latex
+%license LICENSE
+
+%files locale -f sphinx.lang
+%license LICENSE
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
+
+%files -n python2-sphinx
+%license LICENSE
+%doc AUTHORS CHANGES EXAMPLES README.rst
+%{_bindir}/sphinx-*-2*
+%{python2_sitelib}/sphinx/
+%{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/
 %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
 %{_mandir}/man1/*
 
+%ghost %attr(755, root, root) %{_bindir}/sphinx-apidoc
+%ghost %attr(755, root, root) %{_bindir}/sphinx-autogen
+%ghost %attr(755, root, root) %{_bindir}/sphinx-build
+%ghost %attr(755, root, root) %{_bindir}/sphinx-quickstart
+%ghost %attr(644, root, root) %{_mandir}/man1/sphinx-all.1.gz
+%ghost %attr(644, root, root) %{_mandir}/man1/sphinx-apidoc.1.gz
+%ghost %attr(644, root, root) %{_mandir}/man1/sphinx-build.1.gz
+%ghost %attr(644, root, root) %{_mandir}/man1/sphinx-quickstart.1.gz
 %if 0%{?with_python3}
+
 %files -n python3-sphinx
-%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
-%{_bindir}/sphinx-*-%{python3_version}
-%{python3_sitelib}/*
-%dir %{_datadir}/sphinx/
-%dir %{_datadir}/sphinx/locale
-%dir %{_datadir}/sphinx/locale/*
+%license LICENSE
+%doc AUTHORS CHANGES EXAMPLES README.rst
+%{_bindir}/sphinx-*-3*
+%{python3_sitelib}/sphinx/
+%{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
 %{_mandir}/man1/sphinx-*-%{python3_version}.1*
+
+%ghost %attr(755, root, root) %{_bindir}/sphinx-apidoc
+%ghost %attr(755, root, root) %{_bindir}/sphinx-autogen
+%ghost %attr(755, root, root) %{_bindir}/sphinx-build
+%ghost %attr(755, root, root) %{_bindir}/sphinx-quickstart
+%ghost %attr(644, root, root) %{_mandir}/man1/sphinx-all.1.gz
+%ghost %attr(644, root, root) %{_mandir}/man1/sphinx-apidoc.1.gz
+%ghost %attr(644, root, root) %{_mandir}/man1/sphinx-build.1.gz
+%ghost %attr(644, root, root) %{_mandir}/man1/sphinx-quickstart.1.gz
+
 %endif # with_python3
 
 %files doc
-%defattr(-,root,root,-)
 %doc html reST
 
 
 %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.
+- Cleanup source files that should not be installed
+- Fix the __init__.pyc that was byte compiled for the wrong python
+
+* Fri Feb 17 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-1
+- Update to 1.5.2
+- Remove a few latex dependencies that are no longer needed
+- Remove xapian patch; now in upstream tarball
+- Disable checks.  The tests require pytest >= 3.0 and we only have
+  pytest-2.9.2 on F25
+
+* Fri Feb 17 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 17 2017 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-1
+- Update to 1.5.1
+
+* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.4.9-3
+- Change alternatives priority so that the python2 version gets the default to
+  follow Fedora policy.
+
+* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.4.9-1
+- Update to 1.4.9
+- Enable python3 tests
+
+* Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.4.8-3
+- Rebuild for Python 3.6
+- Disable python3 tests for now
+
+* Thu Oct 6 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.8-2
+- Added tex(luatex85.sty) dependency to support TexLive 2016
+
+* Thu Oct 6 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.8-1
+- Update to 1.4.8
+- Alternatives fails for scripts sometimes (bz#1382405)
+
+* Sun Sep 4 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.6-2
+- Alternatives fails for man pages due to existing files
+
+* Fri Sep 2 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.6-1
+- Update to 1.4.6 (bz#1370810)
+- Fix unversioned Obsoletes
+- Add alternatives slaves for man pages
+
+* Fri Aug 12 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.5-1
+- Update to 1.4.5 (bz#1356336)
+- Remove Recommends for latex, locale, and doc subpackages (bz#1366624)
+- Remove Requires from locale subpackage (bz#1366624)
+- Set executable scripts via alternatives  (bz#1321413)
+- Change graphviz Requires to Recommends (bz#1366706)
+
+* Sun Jul 03 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.4-2
+- doc and locale no longer specifically require python2-sphinx
+- Colapsed python3-sphinx-latex into python-latex
+
+* Sun Jun 12 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.4-1
+- Updated to 1.4.4
+- Added python-sphinx-locale for common locale files
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-4
+- Obsolete napoleon extension, it is now packaged with sphinx (#1286275)
+- Rename python2-Sphinx to python2-sphinx
+- Add conflicts to disallow parallel installation of different versions,
+  which causes file conflicts because of the shared documentation files.
+
+* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-3
+- Restore using python2 scripts by default (#1285535)
+
+* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-2
+- Fix requirements of python2- subpackage
+- Provide sphinx-*-{3.5,3} symlinks for each script
+
+* Tue Nov 24 2015 Julien Enselme <jujens@jujens.eu> - 1.3.1-1
+- Update to 1.3.1 (#1136284)
+- Update to new guidelines
+- Make the default executable use python3
+
+* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 1.2.3-5
+- Rebuilt for Python3.5 rebuild
+- add patch to reflect that Python3.5 dropped HTMLParserError
+
+* Mon Jul 20 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-4
+- Fix line encoding of bundled jquery.js
+
+* Mon Jul 20 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-3
+- Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Feb  5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-1
+- Update to 1.2.3
+- Mark license file with %%license instead of %%doc
+
+* Thu Feb  5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-10
+- Complete LaTeX builder deps (fixes bz#882166)
+- Make test output verbose
+- Add BRs needed to enable all tests
+
+* Tue Feb  3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-9
+- python3-sphinx package also Provides: python3-sphinx-latex
+
+* Tue Feb  3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-8
+- If a separate LaTeX subpackage is not generated, the main package should have
+  a virtual Provides: for it (bz#1187989)
+
+* Tue Jan 27 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-7
+- Disable separate LaTeX builder for now (bz#1185574)
+
+* Thu Jan 22 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-6
+- Split off LaTeX builder into its own subpackages, to remove TeXLive
+  dependencies from the main package.
+  Thanks to Robert Kuska <rkuska@redhat.com> for feedback
+- Clean up python3-sphinx's locale files, they ended up in the python2 package.
+  Share the locale files in /usr/share instead
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May 27 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.2-4
+- Don't own the -3 scripts by python 2 package
+
+* Thu May 22 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.2-3
+- Add sphinx-*-3 links to scripts
+Resolves: #1098109
+
+* Fri May  9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-2
+- Rebuild for Python 3.4
+
+* Fri May  9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-1
+- Update to 1.2.2
+
+* Thu Feb 13 2014 Michel Salim <salimma@fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1 @@
-8f55a6d4f87fc6d528120c5d1f983e98  Sphinx-1.1.3.tar.gz
+SHA512 (Sphinx-1.5.2.tar.gz) = 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88

sphinx-docutils-0.10.patch

@@ -1,28 +0,0 @@
-diff -up Sphinx-1.1.3/sphinx/writers/manpage.py.bak Sphinx-1.1.3/sphinx/writers/manpage.py
---- Sphinx-1.1.3/sphinx/writers/manpage.py.bak	2011-11-01 00:38:44.000000000 -0700
-+++ Sphinx-1.1.3/sphinx/writers/manpage.py	2012-08-21 12:38:33.380808202 -0700
-@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato
-         # since self.append_header() is never called, need to do this here
-         self.body.append(MACRO_DEF)
- 
-+        # Overwrite admonition label translations with our own
-+        for label, translation in admonitionlabels.items():
-+            self.language.labels[label] = self.deunicode(translation)
-+
-+
-     # overwritten -- added quotes around all .TH arguments
-     def header(self):
-         tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
-@@ -193,12 +198,6 @@ class ManualPageTranslator(BaseTranslato
-     def depart_seealso(self, node):
-         self.depart_admonition(node)
- 
--    # overwritten -- use our own label translations
--    def visit_admonition(self, node, name=None):
--        if name:
--            self.body.append('.IP %s\n' %
--                             self.deunicode(admonitionlabels.get(name, name)))
--
-     def visit_productionlist(self, node):
-         self.ensure_eol()
-         names = []