|
|
|
|
@@ -1,34 +1,21 @@
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
|
|
|
|
%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
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} > 7
|
|
|
|
|
# Build without BuildRequires ImageMagick, to skip imgconverter tests
|
|
|
|
|
%bcond_with imagemagick_tests
|
|
|
|
|
%else
|
|
|
|
|
%bcond_without imagemagick_tests
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport
|
|
|
|
|
%bcond_without websupport
|
|
|
|
|
# Also, we don't have all the tests requirements
|
|
|
|
|
%bcond_without tests
|
|
|
|
|
|
|
|
|
|
# Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming
|
|
|
|
|
%if 1
|
|
|
|
|
%global py3_default 0
|
|
|
|
|
%else
|
|
|
|
|
# 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.7.5
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
Epoch: 1
|
|
|
|
|
Version: 1.4.8
|
|
|
|
|
Release: 3%{?dist}
|
|
|
|
|
Summary: Python documentation generator
|
|
|
|
|
|
|
|
|
|
Group: Development/Tools
|
|
|
|
|
@@ -40,61 +27,34 @@ 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
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
Patch0: Sphinx-1.2.1-mantarget.patch
|
|
|
|
|
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
BuildRequires: python2-devel >= 2.4
|
|
|
|
|
BuildRequires: python2-babel
|
|
|
|
|
BuildRequires: python2-setuptools
|
|
|
|
|
BuildRequires: python2-docutils
|
|
|
|
|
BuildRequires: python2-jinja2
|
|
|
|
|
BuildRequires: python2-pygments >= 2.0
|
|
|
|
|
BuildRequires: python2-six
|
|
|
|
|
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
|
|
|
|
|
BuildRequires: python2-requests
|
|
|
|
|
BuildRequires: python2-packaging
|
|
|
|
|
BuildRequires: python2-typing
|
|
|
|
|
%if %{with websupport}
|
|
|
|
|
BuildRequires: python2-sphinxcontrib-websupport
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: environment(modules)
|
|
|
|
|
|
|
|
|
|
# for fixes
|
|
|
|
|
BuildRequires: dos2unix
|
|
|
|
|
|
|
|
|
|
%if %{with tests}
|
|
|
|
|
BuildRequires: python2-nose
|
|
|
|
|
BuildRequires: python2-pytest
|
|
|
|
|
BuildRequires: python2-pytest-cov
|
|
|
|
|
# for testing
|
|
|
|
|
BuildRequires: python-nose
|
|
|
|
|
BuildRequires: gettext
|
|
|
|
|
BuildRequires: texinfo
|
|
|
|
|
BuildRequires: graphviz
|
|
|
|
|
BuildRequires: python2-sqlalchemy
|
|
|
|
|
BuildRequires: python-sqlalchemy
|
|
|
|
|
BuildRequires: python2-mock
|
|
|
|
|
BuildRequires: python2-simplejson
|
|
|
|
|
BuildRequires: python2-html5lib
|
|
|
|
|
BuildRequires: python2-whoosh
|
|
|
|
|
BuildRequires: python-whoosh
|
|
|
|
|
BuildRequires: python2-snowballstemmer
|
|
|
|
|
BuildRequires: python2-enum34
|
|
|
|
|
%if %{with imagemagick_tests}
|
|
|
|
|
BuildRequires: ImageMagick
|
|
|
|
|
%endif
|
|
|
|
|
# note: no Python3 xapian binding yet
|
|
|
|
|
BuildRequires: python2-xapian
|
|
|
|
|
BuildRequires: xapian-bindings-python
|
|
|
|
|
BuildRequires: texlive-collection-fontsrecommended
|
|
|
|
|
BuildRequires: texlive-collection-latex
|
|
|
|
|
BuildRequires: texlive-dvipng
|
|
|
|
|
@@ -102,6 +62,7 @@ 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)
|
|
|
|
|
@@ -123,13 +84,6 @@ 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)
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if 0%{?with_python3}
|
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
|
@@ -138,26 +92,15 @@ 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-packaging
|
|
|
|
|
BuildRequires: python3-imagesize
|
|
|
|
|
BuildRequires: python3-requests
|
|
|
|
|
%if %{with websupport}
|
|
|
|
|
BuildRequires: python3-sphinxcontrib-websupport
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with tests}
|
|
|
|
|
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
|
|
|
|
|
%endif
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -192,37 +135,29 @@ the Python docs:
|
|
|
|
|
|
|
|
|
|
%package -n python2-sphinx
|
|
|
|
|
Summary: Python documentation generator
|
|
|
|
|
Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release}
|
|
|
|
|
Requires: python-sphinx-locale = %{version}-%{release}
|
|
|
|
|
Requires: python2-babel
|
|
|
|
|
Requires: python2-docutils
|
|
|
|
|
Requires: python2-jinja2
|
|
|
|
|
Requires: python2-pygments
|
|
|
|
|
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
|
|
|
|
|
Requires: python2-requests
|
|
|
|
|
Requires: python2-packaging
|
|
|
|
|
Requires: python2-typing
|
|
|
|
|
%if %{with websupport}
|
|
|
|
|
Requires: python2-sphinxcontrib-websupport
|
|
|
|
|
%endif
|
|
|
|
|
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
|
|
|
|
|
# Needed to get rid of the alternatives config installed in
|
|
|
|
|
# an earlier version of f24
|
|
|
|
|
Requires(posttrans): /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}
|
|
|
|
|
Provides: python-sphinxcontrib-napoleon = %{version}-%{release}
|
|
|
|
|
Obsoletes: python2-Sphinx <= 1.3.1-4
|
|
|
|
|
Provides: python2-Sphinx = %{?epoch}:%{version}-%{release}
|
|
|
|
|
Provides: python(Sphinx) = %{?epoch}:%{version}-%{release}
|
|
|
|
|
Provides: python2-Sphinx = %{version}-%{release}
|
|
|
|
|
Provides: python(Sphinx) = %{version}-%{release}
|
|
|
|
|
%{?python_provide:%python_provide python2-sphinx}
|
|
|
|
|
Conflicts: python3-sphinx < %{?epoch}:%{version}-%{release}
|
|
|
|
|
Conflicts: python3-sphinx < %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description -n python2-sphinx
|
|
|
|
|
Sphinx is a tool that makes it easy to create intelligent and
|
|
|
|
|
@@ -255,7 +190,7 @@ the Python docs:
|
|
|
|
|
|
|
|
|
|
%package latex
|
|
|
|
|
Summary: LaTeX builder dependencies for %{name}
|
|
|
|
|
Requires: python(Sphinx) = %{?epoch}:%{version}-%{release}
|
|
|
|
|
Requires: python(Sphinx) = %{version}-%{release}
|
|
|
|
|
Requires: texlive-collection-fontsrecommended
|
|
|
|
|
Requires: texlive-collection-latex
|
|
|
|
|
Requires: texlive-dvipng
|
|
|
|
|
@@ -263,6 +198,7 @@ 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)
|
|
|
|
|
@@ -284,12 +220,6 @@ 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
|
|
|
|
|
@@ -308,7 +238,7 @@ builder.
|
|
|
|
|
%package -n python3-sphinx
|
|
|
|
|
Summary: Python documentation generator
|
|
|
|
|
Group: Development/Tools
|
|
|
|
|
Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release}
|
|
|
|
|
Requires: python-sphinx-locale = %{version}-%{release}
|
|
|
|
|
Requires: python3-babel
|
|
|
|
|
Requires: python3-docutils
|
|
|
|
|
Requires: python3-jinja2
|
|
|
|
|
@@ -318,23 +248,17 @@ Requires: python3-snowballstemmer
|
|
|
|
|
Requires: python3-sphinx_rtd_theme
|
|
|
|
|
Requires: python3-sphinx-theme-alabaster
|
|
|
|
|
Requires: python3-imagesize
|
|
|
|
|
Requires: python3-requests
|
|
|
|
|
Requires: python3-six
|
|
|
|
|
Requires: python3-packaging
|
|
|
|
|
%if %{with websupport}
|
|
|
|
|
Requires: python3-sphinxcontrib-websupport
|
|
|
|
|
%endif
|
|
|
|
|
Recommends: graphviz
|
|
|
|
|
Recommends: ImageMagick
|
|
|
|
|
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
|
|
|
|
|
# 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 = %{?epoch}:%{version}-%{release}
|
|
|
|
|
Provides: python(Sphinx) = %{?epoch}:%{version}-%{release}
|
|
|
|
|
Provides: python3-sphinxcontrib-napoleon = %{version}-%{release}
|
|
|
|
|
Provides: python(Sphinx) = %{version}-%{release}
|
|
|
|
|
%{?python_provide:%python_provide python3-sphinx}
|
|
|
|
|
Conflicts: python2-Sphinx < %{?epoch}:%{version}-%{release}
|
|
|
|
|
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
|
|
|
|
|
@@ -370,7 +294,7 @@ the Python docs:
|
|
|
|
|
Summary: Documentation for %{name}
|
|
|
|
|
Group: Documentation
|
|
|
|
|
License: BSD
|
|
|
|
|
Requires: python(Sphinx) = %{?epoch}:%{version}-%{release}
|
|
|
|
|
Requires: python(Sphinx) = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description doc
|
|
|
|
|
Sphinx is a tool that makes it easy to create intelligent and
|
|
|
|
|
@@ -401,40 +325,26 @@ 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
|
|
|
|
|
|
|
|
|
|
%if %{without imagemagick_tests}
|
|
|
|
|
rm tests/test_ext_imgconverter.py
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{without websupport}
|
|
|
|
|
rm tests/test_websupport.py tests/test_api_translator.py
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if 0%{?with_python3}
|
|
|
|
|
rm -rf %{py3dir}
|
|
|
|
|
cp -a . %{py3dir}
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%py2_build
|
|
|
|
|
%if 0%{?with_python3}
|
|
|
|
|
%py3_build
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
export PYTHONPATH=$PWD
|
|
|
|
|
pushd doc
|
|
|
|
|
%if 0%{?with_python3}
|
|
|
|
|
export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py"
|
|
|
|
|
%else
|
|
|
|
|
export SPHINXBUILD="%{__python2} ../sphinx/cmd/build.py"
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
make html SPHINXBUILD="$SPHINXBUILD"
|
|
|
|
|
make man SPHINXBUILD="$SPHINXBUILD"
|
|
|
|
|
make html
|
|
|
|
|
make man
|
|
|
|
|
rm -rf _build/html/.buildinfo
|
|
|
|
|
mv _build/html ..
|
|
|
|
|
popd
|
|
|
|
|
@@ -443,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
|
|
|
|
|
@@ -476,12 +382,6 @@ 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
|
|
|
|
|
@@ -489,7 +389,7 @@ mv doc reST
|
|
|
|
|
|
|
|
|
|
# Move language files to /usr/share;
|
|
|
|
|
# patch to support this incorporated in 0.6.6
|
|
|
|
|
pushd %{buildroot}%{python2_sitelib}
|
|
|
|
|
pushd %{buildroot}%{python_sitelib}
|
|
|
|
|
|
|
|
|
|
for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
|
|
|
|
|
do
|
|
|
|
|
@@ -503,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}
|
|
|
|
|
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
|
|
|
|
|
ln -s %{_bindir}/$filename-3 %{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
|
|
|
|
|
ln -s %{_bindir}/$filename-2 %{buildroot}%{_bindir}/$filename
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
@@ -543,26 +424,26 @@ done
|
|
|
|
|
>> sphinx.lang
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with tests}
|
|
|
|
|
%check
|
|
|
|
|
export PYTHONPATH=$PWD
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
# Igoring test_api_translator for now as it fails on Fedora.
|
|
|
|
|
# The issue has been reported upstream: https://github.com/sphinx-doc/sphinx/issues/4710
|
|
|
|
|
LANG=en_US.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py
|
|
|
|
|
LANG=en_US.UTF-8 make test
|
|
|
|
|
%if 0%{?with_python3}
|
|
|
|
|
pushd %{py3dir}
|
|
|
|
|
# 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
|
|
|
|
|
%endif # with tests
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%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
|
|
|
|
|
@@ -576,40 +457,27 @@ popd
|
|
|
|
|
|
|
|
|
|
%files -n python2-sphinx
|
|
|
|
|
%license LICENSE
|
|
|
|
|
%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora
|
|
|
|
|
%doc AUTHORS CHANGES EXAMPLES README.rst
|
|
|
|
|
%{_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
|
|
|
|
|
%{_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 README.fedora
|
|
|
|
|
%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*
|
|
|
|
|
%{_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
|
|
|
|
|
|
|
|
|
|
@@ -618,83 +486,13 @@ popd
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Tue Jun 19 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.5-1
|
|
|
|
|
- Update to 1.7.5 (bz#1570451)
|
|
|
|
|
* 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.
|
|
|
|
|
|
|
|
|
|
* Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-2
|
|
|
|
|
- Conditionalize the ImageMagick build dependency & tests
|
|
|
|
|
|
|
|
|
|
* Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-1
|
|
|
|
|
- Update to 1.7.2 (bz#1558968)
|
|
|
|
|
|
|
|
|
|
* Tue Mar 13 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.1-1
|
|
|
|
|
- Update to 1.7.1 (bz#1534802)
|
|
|
|
|
|
|
|
|
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.6-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jan 09 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.6-1
|
|
|
|
|
- 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
|
|
|
|
|
* 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).
|
|
|
|
|
@@ -702,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)
|
|
|
|
|
|
