From 47fc0906c88e0356714549e11eafb747f0fc14c7 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 21:19:13 -0800 Subject: [PATCH 1/3] Back out changes for 1.4.9 and texlive 2016 to get just the fixes applied to f24 --- .gitignore | 6 ------ python-sphinx.spec | 17 ++--------------- sources | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 0134fae..3508a1b 100644 --- a/.gitignore +++ b/.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 diff --git a/python-sphinx.spec b/python-sphinx.spec index 149a5e5..341b24b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,7 +14,7 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.4.9 +Version: 1.4.8 Release: 2%{?dist} Summary: Python documentation generator @@ -31,7 +31,7 @@ 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 @@ -89,7 +89,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 @@ -227,7 +226,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 @@ -539,17 +537,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 - 1.4.9-1 -- Update to 1.4.9 -- Enable python3 tests - -* Mon Dec 12 2016 Charalampos Stratakis - 1.4.8-3 -- Rebuild for Python 3.6 -- Disable python3 tests for now - -* Thu Oct 6 2016 Avram Lubkin - 1.4.8-2 -- Added tex(luatex85.sty) dependency to support TexLive 2016 - * Thu Oct 6 2016 Avram Lubkin - 1.4.8-1 - Update to 1.4.8 - Alternatives fails for scripts sometimes (bz#1382405) diff --git a/sources b/sources index 0eaf98a..48d0fe2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.4.9.tar.gz) = 8dd16fc947a59a1fadb0b00f0f6a83a4dd1321569cdb86a96d68f6f9c9acb85d5fa234ffde1a986b95346569b166a90647cc5e9b64516bc184ebad932b1c0156 +5ec718a4855917e149498bba91b74e67 Sphinx-1.4.8.tar.gz From 0a685e9dcd48995f3c3a25bf48f2c165be9e8292 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 22:00:53 -0800 Subject: [PATCH 2/3] Fix changelog version --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 341b24b..da37861 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -529,7 +529,7 @@ popd %changelog -* Fri Dec 30 2016 Toshio Kuratomi - 1.4.9-2 +* Fri Dec 30 2016 Toshio Kuratomi - 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). From b147b1780940d8272c831ad2d059b08f7a8cb600 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 18 Jan 2017 23:06:38 -0800 Subject: [PATCH 3/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. --- python-sphinx.spec | 73 ++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 55 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index da37861..66bf4de 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.4.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -27,10 +27,6 @@ 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 BuildArch: noarch @@ -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 @@ -151,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 @@ -256,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} @@ -360,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 @@ -414,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 @@ -493,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} @@ -507,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 @@ -529,6 +486,12 @@ popd %changelog +* Wed Jan 18 2017 Toshio Kuratomi - 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 - 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