Update to 1.5.6

as the new version breaks too many packages.

.gitignore

@@ -1 +1,11 @@
+/Sphinx-1.2.3.tar.gz
+/Sphinx-1.3.1.tar.gz
+/Sphinx-1.4.4.tar.gz
+/Sphinx-1.4.5.tar.gz
+/Sphinx-1.4.6.tar.gz
+/Sphinx-1.4.8.tar.gz
+/Sphinx-1.4.9.tar.gz
+/Sphinx-1.5.1.tar.gz
 /Sphinx-1.5.2.tar.gz
+/Sphinx-1.5.5.tar.gz
+/Sphinx-1.5.6.tar.gz

README.fedora

@@ -0,0 +1,27 @@
+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

default-sphinx-command.in

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

python-sphinx-xapian.patch

@@ -0,0 +1,34 @@
+From cf795894b9290c5ab2035ae21535f0a7f4b7107a Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Fri, 16 Dec 2016 19:44:27 +0900
+Subject: [PATCH] Fix #3246: xapian search adapter crashes
+
+---
+ CHANGES                                  | 2 ++
+ sphinx/websupport/search/xapiansearch.py | 6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/sphinx/websupport/search/xapiansearch.py b/sphinx/websupport/search/xapiansearch.py
+index 1e43dcb..aa7cff8 100644
+--- a/sphinx/websupport/search/xapiansearch.py
++++ b/sphinx/websupport/search/xapiansearch.py
+@@ -39,16 +39,16 @@ def finish_indexing(self):
+         # Ensure the db lock is removed.
+         del self.database
+ 
+-    def add_document(self, path, title, text):
++    def add_document(self, pagename, filename, title, text):
+         self.database.begin_transaction()
+         # sphinx_page_path is used to easily retrieve documents by path.
+-        sphinx_page_path = '"sphinxpagepath%s"' % path.replace('/', '_')
++        sphinx_page_path = '"sphinxpagepath%s"' % pagename.replace('/', '_')
+         # Delete the old document if it exists.
+         self.database.delete_document(sphinx_page_path)
+ 
+         doc = xapian.Document()
+         doc.set_data(text)
+-        doc.add_value(self.DOC_PATH, path)
++        doc.add_value(self.DOC_PATH, pagename)
+         doc.add_value(self.DOC_TITLE, title)
+         self.indexer.set_document(doc)
+         self.indexer.index_text(text)

python-sphinx.spec

@@ -4,18 +4,19 @@
 %{!?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
+# Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming
+%if 1
+%global py3_default 0
 %else
-%global py3_alt_priority 10
+%global py3_default 1
 %endif
 
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.5.2
-Release:    3%{?dist}
+Version:    1.5.6
+Release:    1%{?dist}
+Epoch:      1
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -27,6 +28,14 @@ Group:      Development/Tools
 License:    BSD and Public Domain and Python and (MIT or GPLv2)
 URL:        http://sphinx-doc.org/
 Source0:    https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+Source1:    python2-sphinx
+Source2:    python3-sphinx
+Source3:    zz-modules-python-sphinx.sh
+Source4:    zz-modules-python-sphinx.csh
+Source5:    README.fedora
+# environment-modules file to select whether the py2 or py3 version of
+# python-sphinx execuitables is default
+Source6:    default-sphinx-command.in
 
 # Backport of a bugfix from the 1.6 upstream branch of sphinx
 # to address a crash with parallel building.
@@ -157,7 +166,7 @@ the Python docs:
 
 %package -n    python2-sphinx
 Summary:       Python documentation generator
-Requires:      python-sphinx-locale = %{version}-%{release}
+Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
 Requires:      python2-babel
 Requires:      python-docutils
 Requires:      python-jinja2
@@ -169,17 +178,19 @@ Requires:      python2-six
 Requires:      python2-sphinx-theme-alabaster
 Requires:      python2-imagesize
 Requires:      python2-requests
+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
-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}
+Provides:      python-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
 Obsoletes:     python2-Sphinx <= 1.3.1-4
-Provides:      python2-Sphinx = %{version}-%{release}
-Provides:      python(Sphinx) = %{version}-%{release}
+Provides:      python2-Sphinx = %{?epoch}:%{version}-%{release}
+Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 %{?python_provide:%python_provide python2-sphinx}
-Conflicts:     python3-sphinx < %{version}-%{release}
+Conflicts:     python3-sphinx < %{?epoch}:%{version}-%{release}
 
 %description -n python2-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -212,7 +223,7 @@ the Python docs:
 
 %package latex
 Summary:       LaTeX builder dependencies for %{name}
-Requires:      python(Sphinx) = %{version}-%{release}
+Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
 Requires:      texlive-dvipng
@@ -264,7 +275,7 @@ builder.
 %package -n python3-sphinx
 Summary:       Python documentation generator
 Group:         Development/Tools
-Requires:      python-sphinx-locale = %{version}-%{release}
+Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
 Requires:      python3-babel
 Requires:      python3-docutils
 Requires:      python3-jinja2
@@ -277,13 +288,15 @@ Requires:      python3-imagesize
 Requires:      python3-requests
 Requires:      python3-six
 Recommends:    graphviz
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
+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
 Obsoletes:     python3-sphinxcontrib-napoleon < 0.3.0
-Provides:      python3-sphinxcontrib-napoleon = %{version}-%{release}
-Provides:      python(Sphinx) = %{version}-%{release}
+Provides:      python3-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
+Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 %{?python_provide:%python_provide python3-sphinx}
-Conflicts:     python2-Sphinx < %{version}-%{release}
+Conflicts:     python2-Sphinx < %{?epoch}:%{version}-%{release}
 
 %description -n python3-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -319,7 +332,7 @@ the Python docs:
 Summary:       Documentation for %{name}
 Group:         Documentation
 License:       BSD
-Requires:      python(Sphinx) = %{version}-%{release}
+Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -350,15 +363,13 @@ This package contains locale files for Sphinx
 %prep
 %autosetup -n %{upstream_name}-%{version}%{?prerel} -p1
 
+cp %{SOURCE5} .
+
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
 # 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}
 cp -a . %{py3dir}
@@ -380,12 +391,13 @@ popd
 
 
 %install
-
 %if 0%{?with_python3}
 %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
@@ -396,9 +408,11 @@ rm %{buildroot}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c}
 %endif # with_python3
 
 %py2_install
+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
@@ -407,15 +421,14 @@ done
 # 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
 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
@@ -425,6 +438,12 @@ done
 find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \;
 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
@@ -445,6 +464,38 @@ 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
@@ -455,72 +506,32 @@ popd
 
 
 %check
-
-# 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
+# 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}
-#LANG=en_US.UTF-8 PYTHON=python3 make test
+# 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 PYTHON=python3 make test
 popd
 %endif # with_python3
 
-%post -n python2-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-%{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
+%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}
-%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
+%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
 
-%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
@@ -533,39 +544,40 @@ fi
 
 %files -n python2-sphinx
 %license LICENSE
-%doc AUTHORS CHANGES EXAMPLES README.rst
+%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 !%{py3_default}
+%{_modulesdir}/python-sphinx/.version
+%endif
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
-%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
 %license LICENSE
-%doc AUTHORS CHANGES EXAMPLES README.rst
+%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora
 %{_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
+%{_libexecdir}/python3-sphinx/
+%{_modulesdir}/python-sphinx/python3-sphinx
+%if %{py3_default}
+%{_modulesdir}/python-sphinx/.version
+%endif
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 %endif # with_python3
 
@@ -574,12 +586,19 @@ fi
 
 
 %changelog
-* Fri Sep 22 2017 Charalampos Stratakis <cstratak@redhat.com> - 1.5.2-3
+* Tue Jan 09 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.5.6-1
+- Update to 1.5.6
+
+* Mon Nov 06 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.5.5-1
+- Update to 1.5.5
+
+* Fri Sep 22 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.5.2-4
 - Fix a crash on parallel build.
 
+* Wed Sep 20 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.5.2-3
+- Provide the epoch tag in order to downgrade at Fedora 26
+
 * 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
 
@@ -587,18 +606,41 @@ fi
 - 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
+* Sat Feb 11 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
+* 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
 
-* 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.
+* 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

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 @@
-SHA512 (Sphinx-1.5.2.tar.gz) = 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88
+SHA512 (Sphinx-1.5.6.tar.gz) = 4190124d093fca3633a40187731d4284fa041c5d1159af1087ceec507eb398f693dcc655cbce779b63c25e4c925a07dfbfaae5f27c36e42df97226d335be951f

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 >& /dev/null

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 2> /dev/null