#3 https://fedoraproject.org/wiki/Changes/Sphinx2
Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.
rpms/ churchyard/python-py nopy2sphinx  into  master

file modified
+2 -11
@@ -49,9 +49,6 @@ 

  BuildRequires:  python2-devel

  BuildRequires:  python2-setuptools

  BuildRequires:  python2-setuptools_scm

- %if %{with docs}

- BuildRequires:  %{_bindir}/sphinx-build-2

- %endif # with_docs

  %if %{with tests}

  BuildRequires:  python2-pytest >= %{pytest_version_lb}, python2-pytest < %{pytest_version_ub}

  %endif # with tests
@@ -80,7 +77,7 @@ 

  BuildRequires:  python3-setuptools

  BuildRequires:  python3-setuptools_scm

  %if %{with docs}

- BuildRequires:  %{_bindir}/sphinx-build-3

+ BuildRequires:  %{_bindir}/sphinx-build

  %endif # with_docs

  %if %{with tests}

  BuildRequires:  python3-pytest >= %{pytest_version_lb}, python3-pytest < %{pytest_version_ub}
@@ -121,9 +118,6 @@ 

  %if %{with python2}

  pushd python2

  %py2_build

- %if %{with docs}

- make -C doc html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-2

- %endif # with docs

  popd

  %endif # with python2

  
@@ -131,7 +125,7 @@ 

  pushd python3

  %py3_build

  %if %{with docs}

- make -C doc html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-3

+ make -C doc html PYTHONPATH=$(pwd)

  %endif # with docs

  popd

  %endif # with python3
@@ -182,9 +176,6 @@ 

  %doc python2/CHANGELOG

  %doc python2/README.rst

  %license python2/LICENSE

- %if %{with docs}

- %doc python2/doc/_build/html

- %endif # with_docs

  %{python2_sitelib}/py-*.egg-info/

  %{python2_sitelib}/py/

  %endif # with python2

no initial comment

Yes, please go ahead.

Pull-Request has been merged by churchyard

5 years ago