- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
(cherry picked from commit9ea173bb1e) Update to 1.5.2 Remove a few latex dependencies that are no longer needed (cherry picked from commit5bf198167c) Remember to update the source tarball as well (cherry picked from commit145cab2c32) Xapian patch no longer needed (cherry picked from commitb5d98f0f4d) Add more buildrequires for tests (cherry picked from commitf73229b3b1) Modify changelog dates for the merged revisions
This commit is contained in:
Fedora Release Engineering
Toshio Kuratomi
parent
0389475b57
commit
7734c3da73
3 changed files with 37 additions and 14 deletions
|
|
@ -14,8 +14,8 @@
|
|||
%endif
|
||||
|
||||
Name: python-sphinx
|
||||
Version: 1.4.9
|
||||
Release: 3%{?dist}
|
||||
Version: 1.5.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Python documentation generator
|
||||
|
||||
Group: Development/Tools
|
||||
|
|
@ -27,7 +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
|
||||
#Patch0: Sphinx-1.2.1-mantarget.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: python2-devel >= 2.4
|
||||
|
|
@ -40,19 +39,26 @@ BuildRequires: python-six
|
|||
BuildRequires: python2-sphinx_rtd_theme
|
||||
BuildRequires: python2-sphinx-theme-alabaster
|
||||
BuildRequires: python2-imagesize
|
||||
BuildRequires: python2-requests
|
||||
BuildRequires: environment(modules)
|
||||
|
||||
# for fixes
|
||||
BuildRequires: dos2unix
|
||||
|
||||
# for testing
|
||||
BuildRequires: python-nose
|
||||
BuildRequires: python2-pytest
|
||||
BuildRequires: python-pytest-cov
|
||||
BuildRequires: gettext
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: python-sqlalchemy
|
||||
BuildRequires: python2-mock
|
||||
BuildRequires: python2-simplejson
|
||||
BuildRequires: python-html5lib
|
||||
BuildRequires: python-whoosh
|
||||
BuildRequires: python2-snowballstemmer
|
||||
BuildRequires: python-enum34
|
||||
# note: no Python3 xapian binding yet
|
||||
BuildRequires: xapian-bindings-python
|
||||
BuildRequires: texlive-collection-fontsrecommended
|
||||
|
|
@ -62,7 +68,6 @@ 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)
|
||||
|
|
@ -85,6 +90,10 @@ 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(eu1enc.def)
|
||||
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python3-devel
|
||||
|
|
@ -94,14 +103,19 @@ BuildRequires: python3-docutils
|
|||
BuildRequires: python3-jinja2
|
||||
BuildRequires: python3-pygments
|
||||
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
|
||||
BuildRequires: python3-six
|
||||
BuildRequires: python3-sphinx_rtd_theme
|
||||
BuildRequires: python3-sphinx-theme-alabaster
|
||||
BuildRequires: python3-imagesize
|
||||
BuildRequires: python3-requests
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
|
|
@ -147,6 +161,7 @@ Requires: python2-sphinx_rtd_theme
|
|||
Requires: python2-six
|
||||
Requires: python2-sphinx-theme-alabaster
|
||||
Requires: python2-imagesize
|
||||
Requires: python2-requests
|
||||
Recommends: graphviz
|
||||
Requires(post): %{_sbindir}/update-alternatives
|
||||
Requires(postun): %{_sbindir}/update-alternatives
|
||||
|
|
@ -198,7 +213,6 @@ 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)
|
||||
|
|
@ -221,6 +235,10 @@ 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(eu1enc.def)
|
||||
Obsoletes: python3-sphinx-latex < 1.4.4-2
|
||||
|
||||
%description latex
|
||||
|
|
@ -249,6 +267,7 @@ Requires: python3-snowballstemmer
|
|||
Requires: python3-sphinx_rtd_theme
|
||||
Requires: python3-sphinx-theme-alabaster
|
||||
Requires: python3-imagesize
|
||||
Requires: python3-requests
|
||||
Requires: python3-six
|
||||
Recommends: graphviz
|
||||
Requires(post): %{_sbindir}/update-alternatives
|
||||
|
|
@ -258,7 +277,6 @@ Provides: python3-sphinxcontrib-napoleon = %{version}-%{release}
|
|||
Provides: python(Sphinx) = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python3-sphinx}
|
||||
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
|
||||
|
|
@ -528,6 +546,17 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
* Fri Feb 17 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
|
||||
- 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.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue