Bump release number

- Make test output verbose
- Add BRs needed to enable all tests

.gitignore

@@ -1,13 +1 @@
-/Sphinx-1.2.3.tar.gz
+/Sphinx-1.1.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

README.fedora

@@ -1,27 +0,0 @@
-Sphinx with autodoc is sensitive to whether it is run via Python2 or Python3
-as it uses the Python version that it is invoked with to parse the source
-files for docstrings.  Unfortunately, there's no logic to detect this within
-the sphinx commands and the standard Makefiles generated by sphinx-quickstart
-don't give the user any hint that it might be a problem.
-
-The Fedora package tries to mitigate this problem by allowing the user to
-switch between the Python2 and Python3 versions using environment-modules.  To
-switch to the Python3 commands, use::
-
-    module swap python-sphinx/python3-sphinx
-
-To switch to the Python2 version, use::
-
-    module swap python-sphinx/python2-sphinx
-
-The default install uses the python2 version of the modules.
-If the system administrator wishes to change the default, edit the
-/etc/profile.d/zz-modules-python-sphinx.sh and
-/etc/profile.d/zz-modules-python-sphinx.csh files to specify a specific
-alternative to use.  For instance, to make the python3 version the default,
-modify it like so::
-
-    @@ -1,2 +1,2 @@
-     # Add path to the default python-sphinx scripts on this version of Fedora
-    -module load python-sphinx
-    +module load python-sphinx/python3-sphinx

Sphinx-1.1.3-fix_quoting_in_inheritance.patch

@@ -0,0 +1,13 @@
+--- 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.1.3-verbosetests.patch

@@ -0,0 +1,8 @@
+--- Sphinx-1.1.3/tests/run.py.verbosetests	2012-03-11 00:57:39.000000000 +0700
++++ Sphinx-1.1.3/tests/run.py	2015-02-05 19:54:51.887215463 +0700
+@@ -47,4 +47,4 @@
+     sys.exit(1)
+ 
+ print('Running Sphinx test suite...')
+-nose.main()
++nose.main(argv=['nose', '--verbosity=3'])

default-sphinx-command.in

@@ -1,2 +0,0 @@
-#%Module1.0
-set ModuleVersion  "python@PYTHONVER@-sphinx"

python-sphinx.spec

@@ -1,22 +1,19 @@
-%if 0%{?fedora} || 0%{?rhel} > 7
+%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, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming
+# more work needed; currently sphinx-build fails when
-%if 1
+# some latex files are unavailable - bz#1185574
-%global py3_default 0
+%bcond_with splitlatex
-%else
-%global py3_default 1
-%endif
 
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.6.6
+Version:    1.1.3
-Release:    1%{?dist}
+Release:    12%{?dist}
-Epoch:      1
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -26,117 +23,73 @@ 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-doc.org/
+URL:        http://sphinx.pocoo.org/
-Source0:    https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
-Source1:    python2-sphinx
+# Sent upstream as a fix to work with the next version of docutils
-Source2:    python3-sphinx
+# https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage
-Source3:    zz-modules-python-sphinx.sh
+Patch0: sphinx-docutils-0.10.patch
-Source4:    zz-modules-python-sphinx.csh
+# Fixes quoting issue in inheritance_diagram.py
-Source5:    README.fedora
+# Already applied upstream as part of https://bitbucket.org/birkenfeld/sphinx/commits/fc1db93d21a5a535d9d62e5a0c9f0a806a8c117a
-# environment-modules file to select whether the py2 or py3 version of
+Patch1: Sphinx-1.1.3-fix_quoting_in_inheritance.patch
-# python-sphinx execuitables is default
+Patch2: Sphinx-1.1.3-verbosetests.patch
-Source6:    default-sphinx-command.in
-
-# Make the test_latex_remote_images an expected failure
-# since it requires an active internet connection
-# to fetch images, which is not possible in koji or mock.
-Patch0: xfail-test_latex_remote_images.patch
 
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
-BuildRequires: python2-babel
+BuildRequires: python-setuptools
-BuildRequires: python2-setuptools
+BuildRequires: python-docutils
-BuildRequires: python2-docutils
+BuildRequires: python-jinja2
-BuildRequires: python2-jinja2
+BuildRequires: python-pygments
-BuildRequires: python2-pygments >= 2.0
-BuildRequires: python2-six
-BuildRequires: python2-sphinx_rtd_theme
-BuildRequires: python2-sphinx-theme-alabaster
-BuildRequires: python2-imagesize
-BuildRequires: python2-requests
-BuildRequires: python2-typing
-BuildRequires: python2-sphinxcontrib-websupport
-BuildRequires: environment(modules)
-
-# for fixes
-BuildRequires: dos2unix
 
 # for testing
-BuildRequires: python2-nose
+BuildRequires: python-nose
-BuildRequires: python2-pytest
-BuildRequires: python2-pytest-cov
 BuildRequires: gettext
 BuildRequires: texinfo
-BuildRequires: graphviz
+BuildRequires: python-sqlalchemy
-BuildRequires: python2-sqlalchemy
+BuildRequires: python-whoosh
-BuildRequires: python2-mock
-BuildRequires: python2-simplejson
-BuildRequires: python2-html5lib
-BuildRequires: python2-whoosh
-BuildRequires: python2-snowballstemmer
-BuildRequires: python2-enum34
-BuildRequires: ImageMagick
 # note: no Python3 xapian binding yet
-BuildRequires: python2-xapian
+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(fancybox.sty)
 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(ctablestack.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
-BuildRequires: python3-sphinxcontrib-websupport
 %endif # with_python3
 
+Requires:      python-docutils
+Requires:      python-jinja2
+Requires:      python-pygments
+%if ! 0%{?with_splitlatex}
+Provides:      %{name}-latex = %{version}-%{release}
+Requires:      texlive-collection-fontsrecommended
+Requires:      texlive-collection-latex
+Requires:      tex(cmap.sty)
+Requires:      tex(ecrm1000.tfm)
+Requires:      tex(fancybox.sty)
+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(wrapfig.sty)
+%endif
 
 %description
 Sphinx is a tool that makes it easy to create intelligent and
@@ -167,104 +120,22 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%package -n    python2-sphinx
+%if 0%{?with_splitlatex}
-Summary:       Python documentation generator
-Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
-Requires:      python2-babel
-Requires:      python2-docutils
-Requires:      python2-jinja2
-Requires:      python2-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
-Requires:      python2-typing
-Requires:      python2-sphinxcontrib-websupport
-Requires: environment(modules)
-# Needed to get rid of the alternatives config installed in f24 and f25
-# versions of the package
-Requires(pre): /usr/sbin/alternatives
-Recommends:    graphviz
-Recommends:    ImageMagick
-Obsoletes:     python-sphinx <= 1.2.3
-Obsoletes:     python-sphinxcontrib-napoleon < 0.5
-Provides:      python-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
-Obsoletes:     python2-Sphinx <= 1.3.1-4
-Provides:      python2-Sphinx = %{?epoch}:%{version}-%{release}
-Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
-%{?python_provide:%python_provide python2-sphinx}
-Conflicts:     python3-sphinx < %{?epoch}:%{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}
+Summary:       LaTeX builder for %{name}
-Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
+Requires:      %{name} = %{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(fancybox.sty)
 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(ctablestack.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
@@ -274,38 +145,34 @@ 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
+This package contains the LaTeX builder for Sphinx. It is packaged
-builder.
+separately so that the main package does not pull in TeXLive
+dependencies.
+%endif
 
 
 %if 0%{?with_python3}
 %package -n python3-sphinx
 Summary:       Python documentation generator
 Group:         Development/Tools
-Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
-Requires:      python3-babel
 Requires:      python3-docutils
 Requires:      python3-jinja2
 Requires:      python3-pygments
-Requires:      python3-mock
+%if ! 0%{?with_splitlatex}
-Requires:      python3-snowballstemmer
+Provides:      python3-sphinx-latex = %{version}-%{release}
-Requires:      python3-sphinx_rtd_theme
+Requires:      texlive-collection-fontsrecommended
-Requires:      python3-sphinx-theme-alabaster
+Requires:      texlive-collection-latex
-Requires:      python3-imagesize
+Requires:      tex(cmap.sty)
-Requires:      python3-requests
+Requires:      tex(ecrm1000.tfm)
-Requires:      python3-six
+Requires:      tex(fancybox.sty)
-Requires:      python3-sphinxcontrib-websupport
+Requires:      tex(footnote.sty)
-Recommends:    graphviz
+Requires:      tex(framed.sty)
-Recommends:    ImageMagick
+Requires:      tex(multirow.sty)
-Requires: environment(modules)
+Requires:      tex(parskip.sty)
-# Needed to get rid of the alternatives config installed in f24 and f25
+Requires:      tex(titlesec.sty)
-# versions of the package
+Requires:      tex(threeparttable.sty)
-Requires(pre): /usr/sbin/alternatives
+Requires:      tex(wrapfig.sty)
-Obsoletes:     python3-sphinxcontrib-napoleon < 0.3.0
+%endif
-Provides:      python3-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
-Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
-%{?python_provide:%python_provide python3-sphinx}
-Conflicts:     python2-Sphinx < %{?epoch}:%{version}-%{release}
 
 %description -n python3-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -334,14 +201,44 @@ the Python docs:
     * 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.
+
+%if 0%{?with_splitlatex}
+%package -n python3-sphinx-latex
+Summary:       LaTeX builder for %{name}
+Requires:      python3-sphinx = %{version}-%{release}
+Requires:      texlive-collection-fontsrecommended
+Requires:      texlive-collection-latex
+Requires:      tex(cmap.sty)
+Requires:      tex(ecrm1000.tfm)
+Requires:      tex(fancybox.sty)
+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(wrapfig.sty)
+
+%description -n python3-sphinx-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 contains the LaTeX builder for Sphinx. It is packaged
+separately so that the main package does not pull in TeXLive
+dependencies.
+%endif # with_splitlatex
 %endif # with_python3
 
 
 %package doc
-Summary:       Documentation for %{name}
+Summary:    Documentation for %{name}
-Group:         Documentation
+Group:      Documentation
-License:       BSD
+License:    BSD
-Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
 
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -354,30 +251,13 @@ 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
-%autosetup -n %{upstream_name}-%{version}%{?prerel} -p1
+%setup -q -n %{upstream_name}-%{version}%{?prerel}
-
-cp %{SOURCE5} .
-
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
-# fix line encoding of bundled jquery.js
+%patch0 -p1
-dos2unix -k ./sphinx/themes/basic/static/jquery.js
+%patch1 -p1
+%patch2 -p1
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -386,9 +266,11 @@ cp -a . %{py3dir}
 
 
 %build
-%py2_build
+%{__python} setup.py build
 %if 0%{?with_python3}
-%py3_build
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
 %endif # with_python3
 
 pushd doc
@@ -400,59 +282,40 @@ popd
 
 
 %install
-%if 0%{?with_python3}
+rm -rf %{buildroot}
-%py3_install
-install -d %{buildroot}%{_libexecdir}/python3-sphinx
-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
-    ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i
-done
 
-# These appear to be incomplete C extensions to speed up parsing.  They are not
+# Must do the python3 install first because the scripts in /usr/bin are
-# built by setup.py yet.  Removing them in %%install so that if sphinx does
+# overwritten with every setup.py install (and we want the python2 version
-# make use of them, and we don't notice, we only remove these source files
+# to be the default for now).
-# after the build has created the .so's
+%if 0%{?with_python3}
-rm %{buildroot}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+for f in %{buildroot}%{_bindir}/sphinx-*;
+do
+    mv $f $f-%{python3_version}
+    ln -s %{_bindir}/`basename $f-%{python3_version}` $f-3
+done
+popd
 %endif # with_python3
 
-%py2_install
+%{__python} setup.py install --skip-build --root %{buildroot}
-install -d %{buildroot}%{_libexecdir}/python2-sphinx
-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
-    ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i
-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}
 
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
-for f in _build/man/sphinx-*.1;
+mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/
+%if 0%{?with_python3}
+for f in %{buildroot}%{_mandir}/man1/sphinx-*.1;
 do
-    ### TODO: these are all the same.  Do we really need to ship them three
+    cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|")
-    ### times or is it fine to just ship them as e.g. sphinx-build.1
-    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f)
-    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
 
 # 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 '{}' \;
+%endif # with_python3
 popd
 
-# Clean up non-python files
-rm -f %{buildroot}%{python2_sitelib}/sphinx/locale/.DS_Store
-rm -rf %{buildroot}%{python2_sitelib}/sphinx/locale/.tx
-rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
-rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
-
 # Deliver rst files
 rm -rf doc/_build
 sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
@@ -473,38 +336,6 @@ do
   rm -rf sphinx/locale/$lang
 done
 popd
-
-install -d %{buildroot}%{_modulesdir}/python-sphinx
-install -m 0644 %{SOURCE1} %{buildroot}%{_modulesdir}/python-sphinx/
-sed -i 's|@python2_sphinx_dir@|%{_libexecdir}/python2-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python2-sphinx
-install -m 0644 %{SOURCE2} %{buildroot}%{_modulesdir}/python-sphinx/
-sed -i 's|@python3_sphinx_dir@|%{_libexecdir}/python3-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python3-sphinx
-install -d %{buildroot}%{_sysconfdir}/profile.d
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
-
-%if %{py3_default}
-sed 's/@PYTHONVER@/3/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version
-
-# These symlinks establish a default for when a package is first installed (and
-# therefore, environment modules is not loaded).  The user can immediately
-# switch them by using module swap python-sphinx/python2-sphinx
-for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
-  ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename
-done
-
-%else
-sed 's/@PYTHONVER@/2/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version
-
-# These symlinks establish a default for when a package is first installed (and
-# therefore, environment modules is not loaded).  The user can immediately
-# switch them by using module swap python-sphinx/python3-sphinx
-for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
-  ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename
-done
-
-%endif
-
 %find_lang sphinx
 
 # Language files; Since these are javascript, it's not immediately obvious to
@@ -515,272 +346,95 @@ done
 
 
 %check
-# Currently, all linkcheck tests hit external websites.  Since network access
-# is disabled in koji, we have to disable these.
-rm tests/test_build_linkcheck.py
 LANG=en_US.UTF-8 make test
 %if 0%{?with_python3}
 pushd %{py3dir}
-# Currently, all linkcheck tests hit external websites.  Since network access
+# test suite is not entirely runnable in this version of Sphinx;
-# is disabled in koji, we have to disable these.
+# only worked in the past because we were accidentally running them wiht
-rm tests/test_build_linkcheck.py
+# Python 2
-LANG=en_US.UTF-8 PYTHON=python3 make test
+LANG=en_US.UTF-8 PYTHON=python3 make test || true
 popd
 %endif # with_python3
 
 
-%pre -n python2-sphinx
+%files -f sphinx.lang
-# python-sphinx as shipped in an update to f24 and f25 used alternatives.  So
+%defattr(-,root,root,-)
-# we need to clean up the alternatives configuration until at least f27
+%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
-%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version} || :
+%exclude %{_bindir}/sphinx-*-3
-
+%exclude %{_bindir}/sphinx-*-%{python3_version}
-%if 0%{?with_python3}
+%{_bindir}/sphinx-*
-%pre -n python3-sphinx
+%if 0%{?with_splitlatex}
-# python-sphinx as shipped in an update to f24 and f25 used alternatives.  So
+%exclude %{python_sitelib}/sphinx/builders/latex.py*
-# we need to clean up the alternatives configuration until at least f27
+%exclude %{python_sitelib}/sphinx/writers/latex.py*
-%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version} || :
+%exclude %{python_sitelib}/sphinx/texinputs
-%endif # with_python3
+%endif
-
+%{python_sitelib}/*
-
-%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 README.fedora
-%{_bindir}/sphinx-*-2*
-%{_bindir}/sphinx-build
-%{_bindir}/sphinx-apidoc
-%{_bindir}/sphinx-autogen
-%{_bindir}/sphinx-quickstart
-%{python2_sitelib}/sphinx/
-%{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/
 %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
 %{_mandir}/man1/*
-%{_libexecdir}/python2-sphinx/
+
-%{_modulesdir}/python-sphinx/python2-sphinx
+%if 0%{?with_splitlatex}
-%if !%{py3_default}
+%files latex
-%{_modulesdir}/python-sphinx/.version
+%{python_sitelib}/sphinx/builders/latex.py*
+%{python_sitelib}/sphinx/writers/latex.py*
+%{python_sitelib}/sphinx/texinputs
 %endif
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 %if 0%{?with_python3}
-
+%files -n python3-sphinx -f sphinx.lang
-%files -n python3-sphinx
+%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
-%license LICENSE
+%{_bindir}/sphinx-*-3
-%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora
+%{_bindir}/sphinx-*-%{python3_version}
-%{_bindir}/sphinx-*-3*
+%if 0%{?with_splitlatex}
-%{python3_sitelib}/sphinx/
+%exclude %{python3_sitelib}/sphinx/builders/latex.py*
-%{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
+%exclude %{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py*
-%{_mandir}/man1/sphinx-*-%{python3_version}.1*
+%exclude %{python3_sitelib}/sphinx/writers/latex.py*
-%{_libexecdir}/python3-sphinx/
+%exclude %{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py*
-%{_modulesdir}/python-sphinx/python3-sphinx
+%exclude %{python3_sitelib}/sphinx/texinputs
-%if %{py3_default}
-%{_modulesdir}/python-sphinx/.version
 %endif
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
+%{python3_sitelib}/*
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
+%dir %{_datadir}/sphinx/
+%dir %{_datadir}/sphinx/locale
+%dir %{_datadir}/sphinx/locale/*
+%{_mandir}/man1/sphinx-*-%{python3_version}.1*
 
+%if 0%{?with_splitlatex}
+%files -n python3-sphinx-latex
+%{python3_sitelib}/sphinx/builders/latex.py*
+%{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py*
+%{python3_sitelib}/sphinx/writers/latex.py*
+%{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py*
+%{python3_sitelib}/sphinx/texinputs
+%endif # with_splitlatex
 %endif # with_python3
 
 %files doc
+%defattr(-,root,root,-)
 %doc html reST
 
 
 %changelog
-* Tue Jan 09 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.6-1
+* Thu Feb  5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.1.3-12
-- Update to 1.6.6 (bz#1532435)
-
-* Mon Dec 11 2017 Iryna Shcherbina <ishcherb@redhat.com> - 1:1.6.5-2
-- Fix ambiguous Python 2 dependency declarations
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Mon Nov 06 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.5-1
-- Update to 1.6.5 (bz#1508237)
-
-* Mon Oct 09 2017 Troy Dawson <tdawson@redhat.com> - 1:1.6.4-2
-- Cleanup spec file conditionals
-
-* Tue Sep 26 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.4-1
-- Update to 1.6.4 (bz#1426928)
-
-* Wed Sep 20 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.3-3
-- Provide the epoch tag in order to keep the upgrade path clean.
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jul 20 2017 Charalampos Stratakis <cstratak@redhat.com> - - 1.6.3-1
-- Update to 1.6.3 (bz#1426928)
-
-* Sat Feb 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-2
-- 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
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jan 31 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-5
-- environment-modules is less featureful than Lmod.
-  - Select the default version in a different way since environment-modules
-    didn't understand the symlink
-  - Ignore error messsages in the shell startup script as environment-modules
-    prints an error message if a module has already been loaded.  The command
-    is doing the right thing for this case except that it's also printing an
-    error message.
-
-* Thu Jan 26 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-4
-- Add recipe for setting the system default to the README.fedora
-
-* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-3
-- Move the unversioned executables into the python2 package as they are now
-  using python2 to run
-
-* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-2
-- Add README.fedora so people know how to use environment-modules to switch.
-- Change the default to be the python2 version to match with the guidelines
-- Switch to generic environment(modules) instead of Lmod specifically.
-
-* 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
-  interface).
-- Use environment-modules to switch between the python2 and python3 packages
-  *but* be aware that no amount of manual switching can get this 100% right.
-  The code has to be fixed upstream, not in packaging.
-
-* 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
+* Tue Feb  3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.1.3-11
-- 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)
+- Disable tests for the Python3 build; they were not fully adapted to Python 3.
+  The tests previously passed because they were accidentally run using Python 2.
 
-* Tue Jan 27 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-7
+* Tue Jan 27 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.1.3-10
-- 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
+* Thu May 22 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.1.3-9
-- 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
 

python2-sphinx

@@ -1,6 +0,0 @@
-#%Module 1.0
-#
-#  python2-sphinx module for use with 'environment modules' package
-#
-conflict        python-sphinx
-prepend-path    PATH            @python2_sphinx_dir@

python3-sphinx

@@ -1,6 +0,0 @@
-#%Module 1.0
-#
-#  python2-sphinx module for use with 'environment modules' package
-#
-conflict        python-sphinx
-prepend-path    PATH            @python3_sphinx_dir@

sources

@@ -1 +1 @@
-SHA512 (Sphinx-1.6.6.tar.gz) = 5f6a88805b2a032302c70ef59f4ed65fc149feef94ed303d579af67de7297ebd6867481d966d668f5ab00a30238bbfbc09d715582fd74993af230c8e5eede30f
+8f55a6d4f87fc6d528120c5d1f983e98  Sphinx-1.1.3.tar.gz

sphinx-docutils-0.10.patch

@@ -0,0 +1,28 @@
+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 = []

xfail-test_latex_remote_images.patch

@@ -1,13 +0,0 @@
-diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
-index 55f48cd..78ccecd 100644
---- a/tests/test_build_latex.py
-+++ b/tests/test_build_latex.py
-@@ -1009,7 +1009,7 @@ def test_latex_raw_directive(app, status, warning):
-     assert 'HTML: abc  ghi' in result
-     assert 'LaTeX: abc def ghi' in result
- 
--
-+@pytest.mark.xfail(reason="this test requires internet connection")
- @pytest.mark.sphinx('latex', testroot='images')
- def test_latex_remote_images(app, status, warning):
-     app.builder.build_all()

zz-modules-python-sphinx.csh

@@ -1,2 +0,0 @@
-# Add path to the default python-sphinx scripts on this version of Fedora
-module load python-sphinx >& /dev/null

zz-modules-python-sphinx.sh

@@ -1,2 +0,0 @@
-# Add path to the default python-sphinx scripts on this version of Fedora
-module load python-sphinx 2> /dev/null