From e680748e283662cbf953ccb4715561cfb5d11589 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sat, 10 Apr 2021 18:29:16 +0200 Subject: [PATCH] Related: #1830318 - drop the last use of ncurses no longer needed We do not install or maintain /etc/DIR_COLORS.256color any more. --- coreutils-colorls.csh | 5 ----- coreutils-colorls.sh | 4 ---- coreutils.spec | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/coreutils-colorls.csh b/coreutils-colorls.csh index 8312dc9..66ec2fa 100755 --- a/coreutils-colorls.csh +++ b/coreutils-colorls.csh @@ -15,11 +15,6 @@ alias l. 'ls -d .*' set COLORS=/etc/DIR_COLORS 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 set COLORS="/etc/DIR_COLORS.$TERM" endif diff --git a/coreutils-colorls.sh b/coreutils-colorls.sh index ac92268..5162f1e 100755 --- a/coreutils-colorls.sh +++ b/coreutils-colorls.sh @@ -22,10 +22,6 @@ if [ -z "$USER_LS_COLORS" ]; then [ -z "$COLORS" ] && [ -e "/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" ] && \ COLORS="/etc/DIR_COLORS" diff --git a/coreutils.spec b/coreutils.spec index 740f896..10aad52 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -162,7 +162,6 @@ Obsoletes: %{name} < 8.24-100 # info doc refers to "Specifying the Time Zone" from glibc-doc (#959597) Recommends: glibc-doc -Recommends: ncurses Summary: coreutils common optional components %description common Optional though recommended components, @@ -310,6 +309,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %changelog * Fri Apr 09 2021 Kamil Dudka - 8.32-22 +- drop the last use of ncurses no longer needed (#1830318) - utimens: fix confusing arg type in internal func * Fri Mar 26 2021 Kamil Dudka - 8.32-21