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,7 +1 @@
-/Sphinx-1.2.3.tar.gz
-/Sphinx-1.3.1.tar.gz
-/Sphinx-1.4.4.tar.gz
-/Sphinx-1.4.5.tar.gz
-/Sphinx-1.4.6.tar.gz
 /Sphinx-1.4.8.tar.gz
-/Sphinx-1.4.9.tar.gz

python-sphinx.spec

@@ -14,8 +14,8 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.4.9
-Release:    2%{?dist}
+Version:    1.4.8
+Release:    3%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -27,11 +27,7 @@ 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
-#Patch0:     Sphinx-1.2.1-mantarget.patch
+Patch0:     Sphinx-1.2.1-mantarget.patch
 
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
@@ -44,7 +40,6 @@ BuildRequires: python-six
 BuildRequires: python2-sphinx_rtd_theme
 BuildRequires: python2-sphinx-theme-alabaster
 BuildRequires: python2-imagesize
-BuildRequires: environment(modules)
 
 # for fixes
 BuildRequires: dos2unix
@@ -89,7 +84,6 @@ BuildRequires: tex(multirow.sty)
 BuildRequires: tex(eqparbox.sty)
 BuildRequires: tex(atbegshi.sty)
 BuildRequires: tex(anyfontsize.sty)
-BuildRequires: tex(luatex85.sty)
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
@@ -152,9 +146,8 @@ Requires:      python2-sphinx_rtd_theme
 Requires:      python2-six
 Requires:      python2-sphinx-theme-alabaster
 Requires:      python2-imagesize
-Requires(posttrans): Lmod
-# Needed to get rid of the alternatives config installed in f24 and f25
-# versions of the package
+# 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
@@ -227,7 +220,6 @@ Requires:      tex(multirow.sty)
 Requires:      tex(eqparbox.sty)
 Requires:      tex(atbegshi.sty)
 Requires:      tex(anyfontsize.sty)
-Requires:      tex(luatex85.sty)
 Obsoletes:     python3-sphinx-latex < 1.4.4-2
 
 %description latex
@@ -258,9 +250,8 @@ Requires:      python3-sphinx-theme-alabaster
 Requires:      python3-imagesize
 Requires:      python3-six
 Recommends:    graphviz
-Requires(posttrans): Lmod
-# Needed to get rid of the alternatives config installed in f24 and f25
-# versions of the package
+# 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}
@@ -362,20 +353,16 @@ 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
 %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
 
 pushd doc
@@ -416,33 +403,14 @@ do
 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}
-ln -s python3-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default
-
-# 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
+ln -s %{_bindir}/$filename-3 %{buildroot}%{_bindir}/$filename
 done
 
 %else
-ln -s python2-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default
-
-# 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
+ln -s %{_bindir}/$filename-2 %{buildroot}%{_bindir}/$filename
 done
 
 %endif
@@ -495,13 +463,11 @@ popd
 %{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/default
-%endif
-%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
+%{_bindir}/sphinx-apidoc
+%{_bindir}/sphinx-autogen
+%{_bindir}/sphinx-build
+%{_bindir}/sphinx-quickstart
+
 
 %if 0%{?with_python3}
 
@@ -509,20 +475,9 @@ popd
 %license LICENSE
 %doc AUTHORS CHANGES EXAMPLES README.rst
 %{_bindir}/sphinx-*-3*
-%{_bindir}/sphinx-build
-%{_bindir}/sphinx-apidoc
-%{_bindir}/sphinx-autogen
-%{_bindir}/sphinx-quickstart
 %{python3_sitelib}/sphinx/
 %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
 %{_mandir}/man1/sphinx-*-%{python3_version}.1*
-%{_libexecdir}/python3-sphinx/
-%{_modulesdir}/python-sphinx/python3-sphinx
-%if %{py3_default}
-%{_modulesdir}/python-sphinx/default
-%endif
-%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 %endif # with_python3
 
@@ -531,7 +486,13 @@ popd
 
 
 %changelog
-* Fri Dec 30 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.9-2
+* 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).
@@ -539,17 +500,6 @@ popd
   *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)

sources

@@ -1 +1 @@
-SHA512 (Sphinx-1.4.9.tar.gz) = 8dd16fc947a59a1fadb0b00f0f6a83a4dd1321569cdb86a96d68f6f9c9acb85d5fa234ffde1a986b95346569b166a90647cc5e9b64516bc184ebad932b1c0156
+5ec718a4855917e149498bba91b74e67  Sphinx-1.4.8.tar.gz