Remove environment-modules as well because aviso doesn't want major changes

like introducing alternatives or environment-modules to hit the released
  Fedora.  This takes the package back to before the alternatives changes
  were erroneously pushed back into f24.

.gitignore

@@ -1,3 +1 @@
-/Sphinx-1.0.4.tar.gz
-/Sphinx-1.0.6.tar.gz
-/Sphinx-1.0.7.tar.gz
+/Sphinx-1.4.8.tar.gz

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

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,12 +1,21 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%if 0%{?fedora}
+%global with_python3 1
+%else
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
+%endif
+
+# At some point, RHEL will need to be in here too
+%if 0%{?fedora} && 0%{?fedora} > 24
+%global py3_default 1
+%else
+%global py3_default 0
 %endif
 
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.0.7
-Release:    2%{?dist}
+Version:    1.4.8
+Release:    3%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -16,18 +25,83 @@ 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
+URL:        http://sphinx-doc.org/
+Source0:    https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+Patch0:     Sphinx-1.2.1-mantarget.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
+
+# for fixes
+BuildRequires: dos2unix
+
+# for testing
 BuildRequires: python-nose
-Requires:      python-docutils
-Requires:      python-jinja2
-Requires:      python-pygments
+BuildRequires: gettext
+BuildRequires: texinfo
+BuildRequires: graphviz
+BuildRequires: python-sqlalchemy
+BuildRequires: python2-mock
+BuildRequires: python-whoosh
+BuildRequires: python2-snowballstemmer
+# 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(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)
+
+%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-sqlalchemy
+BuildRequires: python3-mock
+BuildRequires: python3-whoosh
+BuildRequires: python3-snowballstemmer
+BuildRequires: python3-six
+BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: python3-sphinx-theme-alabaster
+BuildRequires: python3-imagesize
+%endif # with_python3
 
 
 %description
@@ -59,12 +133,168 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%package doc
-Summary:    Documentation for %{name}
-Group:      Documentation
-License:    BSD
-Requires:   %{name} = %{version}-%{release}
+%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
+# Needed to get rid of the alternatives config installed in
+# an earlier version of f24
+Requires(posttrans): /usr/sbin/alternatives
+Recommends:    graphviz
+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(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)
+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
+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-six
+Recommends:    graphviz
+# Needed to get rid of the alternatives config installed in
+# an earlier version of f24
+Requires(posttrans): /usr/sbin/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}
+Conflicts:     python2-sphinx < %{version}-%{release}
+
+%description -n python3-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.
+%endif # with_python3
+
+
+%package doc
+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
@@ -77,12 +307,41 @@ 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
 
+# fix line encoding of bundled jquery.js
+dos2unix -k ./sphinx/themes/basic/static/jquery.js
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif # with_python3
+
+
 %build
-%{__python} setup.py build
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif # with_python3
+
 pushd doc
 make html
 make man
@@ -92,15 +351,35 @@ popd
 
 
 %install
-rm -rf %{buildroot}
-
-%{__python} setup.py install --skip-build --root %{buildroot}
+%if 0%{?with_python3}
+%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
+%endif # with_python3
 
+%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
 
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
-mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/
+for f in _build/man/sphinx-*.1;
+do
+    ### TODO: these are all the same.  Do we really need to ship them three
+    ### 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 '{}' \;
 popd
 
 # Deliver rst files
@@ -112,7 +391,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
@@ -123,6 +402,19 @@ do
   rm -rf sphinx/locale/$lang
 done
 popd
+
+%if %{py3_default}
+for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
+ln -s %{_bindir}/$filename-3 %{buildroot}%{_bindir}/$filename
+done
+
+%else
+for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
+ln -s %{_bindir}/$filename-2 %{buildroot}%{_bindir}/$filename
+done
+
+%endif
+
 %find_lang sphinx
 
 # Language files; Since these are javascript, it's not immediately obvious to
@@ -133,25 +425,227 @@ popd
 
 
 %check
-make test
+LANG=en_US.UTF-8 make test
+%if 0%{?with_python3}
+pushd %{py3dir}
+LANG=en_US.UTF-8 PYTHON=python3 make test
+popd
+%endif # with_python3
 
 
-%files -f sphinx.lang
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
-%{_bindir}/sphinx-*
-%{python_sitelib}/*
+%pre -n python2-sphinx
+# python-sphinx as shipped in an update to f24 and f25 used alternatives.  So
+# we need to clean up the alternatives configuration until at least f27
+%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version} || :
+
+%if 0%{?with_python3}
+%pre -n python3-sphinx
+# python-sphinx as shipped in an update to f24 and f25 used alternatives.  So
+# we need to clean up the alternatives configuration until at least f27
+%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version} || :
+%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/*
+%{_bindir}/sphinx-apidoc
+%{_bindir}/sphinx-autogen
+%{_bindir}/sphinx-build
+%{_bindir}/sphinx-quickstart
+
+
+%if 0%{?with_python3}
+
+%files -n python3-sphinx
+%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*
+
+%endif # with_python3
 
 %files doc
-%defattr(-,root,root,-)
 %doc html reST
 
 
 %changelog
+* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.8-3
+- Remove environment-modules as well because aviso doesn't want major changes
+  like introducing alternatives or environment-modules to hit the released
+  Fedora.  This takes the package back to before the alternatives changes
+  were erroneously pushed back into f24.
+
+* Fri Dec 30 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.8-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.
+
+* 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
+
+* Sat Mar  9 2013 Michel Salim <salimma@fedoraproject.org> - 1.1.3-7
+- Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Aug 21 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.3-5
+- Fix for use of sphinx's manpage writer with docutils-0.10
+
+* Mon Aug  6 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-4
+- Rebuild for Python 3.3
+
+* Fri Aug  3 2012 David Malcolm <dmalcolm@redhat.com> - 1.1.3-3
+- remove rhel logic from with_python3 conditional
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Apr  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-1
+- Update to 1.1.3
+
+* Sun Feb  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.2-5
+- Move python3 runtime dependencies to the right subpackage
+- Properly exclude python3 binaries
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sat Dec 17 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-3
+- BR on texlive-latex for LaTeX tests
+
+* Thu Dec  8 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-2
+- Enable python3 subpackage
+
+* Mon Nov 28 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.2-1
+- Update to upstream 1.1.2
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

python2-sphinx

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

python3-sphinx

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

sources

@@ -1 +1 @@
-42c722d48e52d4888193965dd473adb5  Sphinx-1.0.7.tar.gz
+5ec718a4855917e149498bba91b74e67  Sphinx-1.4.8.tar.gz

zz-modules-python-sphinx.csh

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

zz-modules-python-sphinx.sh

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