rpms/coreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: #1830318 - drop the last use of ncurses no longer needed

Browse Source 
We do not install or maintain /etc/DIR_COLORS.256color any more.
This commit is contained in:
Kamil Dudka 2021-04-10 18:29:16 +02:00
parent 32fb61705f
commit e680748e28
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coreutils-colorls.csh
View File

@ -15,11 +15,6 @@ alias l. 'ls -d .*'
set COLORS=/etc/DIR_COLORS set COLORS=/etc/DIR_COLORS
if ($?TERM) then if ($?TERM) then
if ( -e "/etc/DIR_COLORS.256color" && -e "/usr/bin/tput" ) then
if ( "`/usr/bin/tput colors`" == "256" ) then
set COLORS=/etc/DIR_COLORS.256color
endif
endif
if ( -e "/etc/DIR_COLORS.$TERM" ) then if ( -e "/etc/DIR_COLORS.$TERM" ) then
set COLORS="/etc/DIR_COLORS.$TERM" set COLORS="/etc/DIR_COLORS.$TERM"
endif endif

4
coreutils-colorls.sh
View File

@ -22,10 +22,6 @@ if [ -z "$USER_LS_COLORS" ]; then
[ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.$TERM" ] && \ [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.$TERM" ] && \
COLORS="/etc/DIR_COLORS.$TERM" COLORS="/etc/DIR_COLORS.$TERM"
[ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.256color" ] && \
[ "x`/usr/bin/tty -s && /usr/bin/tput colors 2>/dev/null`" = "x256" ] && \
COLORS="/etc/DIR_COLORS.256color"
[ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS" ] && \ [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS" ] && \
COLORS="/etc/DIR_COLORS" COLORS="/etc/DIR_COLORS"

2
coreutils.spec
View File

@ -162,7 +162,6 @@ Obsoletes: %{name} < 8.24-100
# info doc refers to "Specifying the Time Zone" from glibc-doc (#959597) # info doc refers to "Specifying the Time Zone" from glibc-doc (#959597)
Recommends: glibc-doc Recommends: glibc-doc
Recommends: ncurses
Summary: coreutils common optional components Summary: coreutils common optional components
%description common %description common
Optional though recommended components, Optional though recommended components,
@ -310,6 +309,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%changelog %changelog
* Fri Apr 09 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-22 * Fri Apr 09 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-22
- drop the last use of ncurses no longer needed (#1830318)
- utimens: fix confusing arg type in internal func - utimens: fix confusing arg type in internal func
* Fri Mar 26 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-21 * Fri Mar 26 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-21