From 6972fb24fae8af1523c402490763574ca6417c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
Date: Mon, 16 Apr 2012 07:46:17 +0200
Subject: [PATCH] fix the tcsh colorls.csh behaviour in non-interactive mode
 (#804604)

---
 coreutils-colorls.csh | 2 +-
 coreutils.spec        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/coreutils-colorls.csh b/coreutils-colorls.csh
index 48daa78..0c1b2e3 100755
--- a/coreutils-colorls.csh
+++ b/coreutils-colorls.csh
@@ -16,7 +16,7 @@ if ($?TERM) then
   endif
 endif
 if ( -e "/etc/DIR_COLORS.256color" ) then
-  if ( "`tty -s && tput colors`" == "256" ) then
+  if ( "`tty -s` && tput colors" == "256" ) then
      set COLORS=/etc/DIR_COLORS.256color
   endif
 endif
diff --git a/coreutils.spec b/coreutils.spec
index c9a78e8..7e0976e 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -416,6 +416,10 @@ fi
 %{?!norunuser:%{_sbindir}/runuser}
 
 %changelog
+* Mon Apr 16 2012 Ondrej Vasik <ovasik@redhat.com> 8.16-2
+- fix the tcsh colorls.csh behaviour in non-interactive
+  mode (#804604)
+
 * Mon Mar 26 2012 Ondrej Vasik <ovasik@redhat.com> 8.16-1
 - new upstream release 8.16
 - defuzz patches, remove already applied patches