|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
|
|
|
|
%global with_python3 1
|
|
|
|
|
%else
|
|
|
|
|
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
|
|
|
|
@@ -14,8 +14,9 @@
|
|
|
|
|
%global upstream_name Sphinx
|
|
|
|
|
|
|
|
|
|
Name: python-sphinx
|
|
|
|
|
Version: 1.6.3
|
|
|
|
|
Version: 1.6.6
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
Epoch: 1
|
|
|
|
|
Summary: Python documentation generator
|
|
|
|
|
|
|
|
|
|
Group: Development/Tools
|
|
|
|
@@ -45,10 +46,10 @@ BuildArch: noarch
|
|
|
|
|
BuildRequires: python2-devel >= 2.4
|
|
|
|
|
BuildRequires: python2-babel
|
|
|
|
|
BuildRequires: python2-setuptools
|
|
|
|
|
BuildRequires: python-docutils
|
|
|
|
|
BuildRequires: python-jinja2
|
|
|
|
|
BuildRequires: python-pygments >= 2.0
|
|
|
|
|
BuildRequires: python-six
|
|
|
|
|
BuildRequires: python2-docutils
|
|
|
|
|
BuildRequires: python2-jinja2
|
|
|
|
|
BuildRequires: python2-pygments >= 2.0
|
|
|
|
|
BuildRequires: python2-six
|
|
|
|
|
BuildRequires: python2-sphinx_rtd_theme
|
|
|
|
|
BuildRequires: python2-sphinx-theme-alabaster
|
|
|
|
|
BuildRequires: python2-imagesize
|
|
|
|
@@ -61,22 +62,22 @@ BuildRequires: environment(modules)
|
|
|
|
|
BuildRequires: dos2unix
|
|
|
|
|
|
|
|
|
|
# for testing
|
|
|
|
|
BuildRequires: python-nose
|
|
|
|
|
BuildRequires: python2-nose
|
|
|
|
|
BuildRequires: python2-pytest
|
|
|
|
|
BuildRequires: python-pytest-cov
|
|
|
|
|
BuildRequires: python2-pytest-cov
|
|
|
|
|
BuildRequires: gettext
|
|
|
|
|
BuildRequires: texinfo
|
|
|
|
|
BuildRequires: graphviz
|
|
|
|
|
BuildRequires: python-sqlalchemy
|
|
|
|
|
BuildRequires: python2-sqlalchemy
|
|
|
|
|
BuildRequires: python2-mock
|
|
|
|
|
BuildRequires: python2-simplejson
|
|
|
|
|
BuildRequires: python-html5lib
|
|
|
|
|
BuildRequires: python-whoosh
|
|
|
|
|
BuildRequires: python2-html5lib
|
|
|
|
|
BuildRequires: python2-whoosh
|
|
|
|
|
BuildRequires: python2-snowballstemmer
|
|
|
|
|
BuildRequires: python-enum34
|
|
|
|
|
BuildRequires: python2-enum34
|
|
|
|
|
BuildRequires: ImageMagick
|
|
|
|
|
# note: no Python3 xapian binding yet
|
|
|
|
|
BuildRequires: xapian-bindings-python
|
|
|
|
|
BuildRequires: python2-xapian
|
|
|
|
|
BuildRequires: texlive-collection-fontsrecommended
|
|
|
|
|
BuildRequires: texlive-collection-latex
|
|
|
|
|
BuildRequires: texlive-dvipng
|
|
|
|
@@ -168,11 +169,11 @@ 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
|
|
|
|
|
Requires: python-pygments
|
|
|
|
|
Requires: python2-docutils
|
|
|
|
|
Requires: python2-jinja2
|
|
|
|
|
Requires: python2-pygments
|
|
|
|
|
Requires: python2-mock
|
|
|
|
|
Requires: python2-snowballstemmer
|
|
|
|
|
Requires: python2-sphinx_rtd_theme
|
|
|
|
@@ -190,12 +191,12 @@ Recommends: graphviz
|
|
|
|
|
Recommends: ImageMagick
|
|
|
|
|
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
|
|
|
|
@@ -228,7 +229,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
|
|
|
|
@@ -281,7 +282,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
|
|
|
|
@@ -301,10 +302,10 @@ Requires: environment(modules)
|
|
|
|
|
# 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
|
|
|
|
@@ -340,7 +341,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
|
|
|
|
@@ -594,6 +595,28 @@ popd
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* 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)
|
|
|
|
|
|
|
|
|
|