import setup-2.12.2-2.el8_1.1

This commit is contained in:
CentOS Sources 2019-12-17 01:57:19 -05:00 committed by Andrew Lukoshko
parent 775017d2ca
commit 7dec3d7f0e
2 changed files with 97 additions and 1 deletions

View File

@ -0,0 +1,88 @@
diff --git a/lang.csh b/lang.csh
index 67faefc..1dc78f8 100644
--- a/lang.csh
+++ b/lang.csh
@@ -34,45 +34,47 @@ endif
# The ${LANG} manipulation is necessary only in virtual terminal (a.k.a. console - /dev/tty*):
set in_console=`tty | grep -vc -e '/dev/tty'`
-if (${?LANG} && ${TERM} == 'linux' && in_console == 0) then
- set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
+if (${?LANG} && ${?TERM}) then
+ if (${TERM} == 'linux' && $in_console == 0) then
+ set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
- if (${utf8_used} == 0) then
- switch (${LANG})
- case en_IN*:
- breaksw
+ if (${utf8_used} == 0) then
+ switch (${LANG})
+ case en_IN*:
+ breaksw
- case ja*:
- case ko*:
- case si*:
- case zh*:
- case ar*:
- case fa*:
- case he*:
- case *_IN*:
- setenv LANG en_US.UTF-8
- breaksw
- endsw
- else
- switch (${LANG})
- case en_IN*:
- breaksw
- case ja*:
- case ko*:
- case si*:
- case zh*:
- m case ar*:
- case fa*:
- case he*:
- case *_IN*:
- setenv LANG en_US
- breaksw
- endsw
- endif
+ case ja*:
+ case ko*:
+ case si*:
+ case zh*:
+ case ar*:
+ case fa*:
+ case he*:
+ case *_IN*:
+ setenv LANG en_US.UTF-8
+ breaksw
+ endsw
+ else
+ switch (${LANG})
+ case en_IN*:
+ breaksw
+ case ja*:
+ case ko*:
+ case si*:
+ case zh*:
+ case ar*:
+ case fa*:
+ case he*:
+ case *_IN*:
+ setenv LANG en_US
+ breaksw
+ endsw
+ endif
- # NOTE: We are not exporting the ${LANG} here again on purpose.
- # If user starts GUI session from console manually, then
- # the previously set LANG should be okay to use.
+ # NOTE: We are not exporting the ${LANG} here again on purpose.
+ # If user starts GUI session from console manually, then
+ # the previously set LANG should be okay to use.
+ endif
endif
unset in_console utf8_used

View File

@ -1,7 +1,7 @@
Summary: A set of system configuration and setup files
Name: setup
Version: 2.12.2
Release: 2%{?dist}
Release: 2%{?dist}.1
License: Public Domain
Group: System Environment/Base
URL: https://pagure.io/setup/
@ -13,12 +13,17 @@ Requires: system-release
Conflicts: filesystem < 3
Conflicts: initscripts < 4.26, bash <= 2.0.4-21
Patch1: setup-2.12.2-lang.csh-typos.patch
%description
The setup package contains a set of important system configuration and
setup files, such as passwd, group, and profile.
%prep
%setup -q
%patch1 -p1
./shadowconvert.sh
%build
@ -100,6 +105,9 @@ end
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
%changelog
* Wed Sep 25 2019 Martin Osvald <mosvald@redhat.com> - 2.12.2-2.1
- fix lang.csh script so .cshrc gets read again (#1755360)
* Sat Mar 16 2019 Ondrej Vasik <ovasik@redhat.com> - 2.12.2-2
- do not ship /etc/hosts.allow and /etc/hosts.deny (no need for them
as we don't allow tcp_wrappers in RHEL8, #1663556)