Drop explicit locale setting

Python3 now sets unicode locale automatically, this workaround
should not be necessary anymore. For python2, let's use the lighter locale.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-11-18 22:08:30 +01:00
parent 26b3d1a440
commit de4211c65d

View File

@ -27,7 +27,7 @@
Name: python-sphinx Name: python-sphinx
Version: 1.7.6 Version: 1.7.6
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
Summary: Python documentation generator Summary: Python documentation generator
@ -553,13 +553,13 @@ rm tests/test_build_linkcheck.py
# Igoring test_api_translator for now as it fails on Fedora. # 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 # 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=C.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py
%if 0%{?with_python3} %if 0%{?with_python3}
pushd %{py3dir} pushd %{py3dir}
# Currently, all linkcheck tests hit external websites. Since network access # Currently, all linkcheck tests hit external websites. Since network access
# is disabled in koji, we have to disable these. # is disabled in koji, we have to disable these.
rm tests/test_build_linkcheck.py rm tests/test_build_linkcheck.py
LANG=en_US.UTF-8 PYTHON=python3 make test PYTHON=python3 make test
popd popd
%endif # with_python3 %endif # with_python3
%endif # with tests %endif # with tests
@ -618,6 +618,10 @@ popd
%changelog %changelog
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.6-2
- Drop explicit locale setting for python3, use C.UTF-8 for python2
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
* Mon Jul 23 2018 Marcel Plch <mplch@redhat.com> - 1:1.7.6-1 * Mon Jul 23 2018 Marcel Plch <mplch@redhat.com> - 1:1.7.6-1
- Update to 1.7.6 - Update to 1.7.6