rpms/python-sphinx
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix ambiguous Python 2 dependency declarations

Browse Source
This commit is contained in:
Iryna Shcherbina 2017-12-11 14:09:56 +01:00
parent fa7fa5e015
commit e5eb957b03
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
python-sphinx.spec
View File

@ -15,7 +15,7 @@
Name: python-sphinx Name: python-sphinx
Version: 1.6.5 Version: 1.6.5
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
Summary: Python documentation generator Summary: Python documentation generator
@ -46,10 +46,10 @@ BuildArch: noarch
BuildRequires: python2-devel >= 2.4 BuildRequires: python2-devel >= 2.4
BuildRequires: python2-babel BuildRequires: python2-babel
BuildRequires: python2-setuptools BuildRequires: python2-setuptools
BuildRequires: python-docutils BuildRequires: python2-docutils
BuildRequires: python-jinja2 BuildRequires: python2-jinja2
BuildRequires: python-pygments >= 2.0 BuildRequires: python2-pygments >= 2.0
BuildRequires: python-six BuildRequires: python2-six
BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx_rtd_theme
BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python2-sphinx-theme-alabaster
BuildRequires: python2-imagesize BuildRequires: python2-imagesize
@ -62,22 +62,22 @@ BuildRequires: environment(modules)
BuildRequires: dos2unix BuildRequires: dos2unix
# for testing # for testing
BuildRequires: python-nose BuildRequires: python2-nose
BuildRequires: python2-pytest BuildRequires: python2-pytest
BuildRequires: python-pytest-cov BuildRequires: python2-pytest-cov
BuildRequires: gettext BuildRequires: gettext
BuildRequires: texinfo BuildRequires: texinfo
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: python-sqlalchemy BuildRequires: python2-sqlalchemy
BuildRequires: python2-mock BuildRequires: python2-mock
BuildRequires: python2-simplejson BuildRequires: python2-simplejson
BuildRequires: python-html5lib BuildRequires: python2-html5lib
BuildRequires: python-whoosh BuildRequires: python2-whoosh
BuildRequires: python2-snowballstemmer BuildRequires: python2-snowballstemmer
BuildRequires: python-enum34 BuildRequires: python2-enum34
BuildRequires: ImageMagick BuildRequires: ImageMagick
# note: no Python3 xapian binding yet # note: no Python3 xapian binding yet
BuildRequires: xapian-bindings-python BuildRequires: python2-xapian
BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-fontsrecommended
BuildRequires: texlive-collection-latex BuildRequires: texlive-collection-latex
BuildRequires: texlive-dvipng BuildRequires: texlive-dvipng
@ -171,9 +171,9 @@ the Python docs:
Summary: Python documentation generator Summary: Python documentation generator
Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release} Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release}
Requires: python2-babel Requires: python2-babel
Requires: python-docutils Requires: python2-docutils
Requires: python-jinja2 Requires: python2-jinja2
Requires: python-pygments Requires: python2-pygments
Requires: python2-mock Requires: python2-mock
Requires: python2-snowballstemmer Requires: python2-snowballstemmer
Requires: python2-sphinx_rtd_theme Requires: python2-sphinx_rtd_theme
@ -595,6 +595,10 @@ popd
%changelog %changelog
* 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 * Mon Nov 06 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.5-1
- Update to 1.6.5 (bz#1508237) - Update to 1.6.5 (bz#1508237)