rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add glibc-langpack-en BuildRequires for en_US.UTF-8 locale

Browse Source 
Fedora 30 will remove glibc-all-langpacks from the default buildroot¹.
Ensure en_US.UTF-8 locale is present for the test suite.  Avoid C.UTF-8
until it is more widely used and tested.

¹ https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
This commit is contained in:
Todd Zullinger 2018-11-05 21:38:35 -05:00
parent 314daae243
commit a6a24cf421
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git.spec
View File

@ -25,11 +25,13 @@
%bcond_without python3 %bcond_without python3
# linkchcker is not available on EL <= 7 # linkchcker is not available on EL <= 7
%bcond_without linkcheck %bcond_without linkcheck
%global use_glibc_langpack_en 1
%global use_perl_generators 1 %global use_perl_generators 1
%global use_perl_interpreter 1 %global use_perl_interpreter 1
%else %else
%bcond_with python3 %bcond_with python3
%bcond_with linkcheck %bcond_with linkcheck
%global use_glibc_langpack_en 0
%global use_perl_generators 0 %global use_perl_generators 0
%global use_perl_interpreter 0 %global use_perl_interpreter 0
%endif %endif
@ -181,6 +183,9 @@ BuildRequires: bash
BuildRequires: cvs BuildRequires: cvs
BuildRequires: cvsps BuildRequires: cvsps
%endif # with cvs %endif # with cvs
%if %{use_glibc_langpack_en}
BuildRequires: glibc-langpack-en
%endif # use_glibc_langpack_en
BuildRequires: gnupg BuildRequires: gnupg
%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) %if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 ))
BuildRequires: highlight BuildRequires: highlight
@ -919,6 +924,7 @@ make -C contrib/credential/netrc/ testverbose
- Simplify gpg verification of Source0 - Simplify gpg verification of Source0
- Use %%{without ...} macro consistently - Use %%{without ...} macro consistently
- Add comments to %%endif statements - Add comments to %%endif statements
- Add glibc-langpack-en BuildRequires for en_US.UTF-8 locale
* Mon Oct 22 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.19.1-2 * Mon Oct 22 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.19.1-2
- Update condition for the t5540-http-push-webdav test for future RHEL - Update condition for the t5540-http-push-webdav test for future RHEL