From d72df4e29bb433eb719d8bd50437fb588b425efa Mon Sep 17 00:00:00 2001
From: James Cassell <code@james.cassell.me>
Date: Jun 26 2020 06:45:57 +0000
Subject: [PATCH 1/2] ncurses is required by colorls.sh in coreutils-common


- colorls.sh uses tput from ncurses https://bugzilla.redhat.com/show_bug.cgi?id=469277
- colorls.sh was moved to -common package but the ncurses requirement
was not (in commit 5fb9bc4700bb2ae5e109805e3a0af8796c12904e )

---

diff --git a/coreutils.spec b/coreutils.spec
index e91d35b..fc94073 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.32
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Url:     https://www.gnu.org/software/coreutils/
 Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
@@ -94,7 +94,6 @@ BuildRequires: glibc-langpack-ko
 %endif
 
 Requires: %{name}-common = %{version}-%{release}
-Requires: ncurses
 
 Provides: coreutils-full = %{version}-%{release}
 %include %{SOURCE51}
@@ -125,6 +124,7 @@ packaged as a single multicall binary.
 # yum obsoleting rules explained at:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1107973#c7
 Obsoletes: %{name} < 8.24-100
+Requires: ncurses
 Summary:  coreutils common optional components
 %description common
 Optional though recommended components,
@@ -266,6 +266,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %license COPYING
 
 %changelog
+* Fri Jun 26 2020 James Cassell <cyberpear@fedoraproject.org> - 8.32-7
+- move ncurses to -common package since it's needed for colorls.sh
+
 * Fri May 15 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-6
 - compile with -Dlint to enable optional initialization and cleanup code
 

From 5d1216301214534571714883927c09b5771fcf7d Mon Sep 17 00:00:00 2001
From: James Cassell <code@james.cassell.me>
Date: Jun 26 2020 07:19:47 +0000
Subject: [PATCH 2/2] make ncurses optional


---

diff --git a/coreutils-colorls.csh b/coreutils-colorls.csh
index f631762..8312dc9 100755
--- a/coreutils-colorls.csh
+++ b/coreutils-colorls.csh
@@ -15,7 +15,7 @@ alias l. 'ls -d .*'
 set COLORS=/etc/DIR_COLORS
 
 if ($?TERM) then
-  if ( -e "/etc/DIR_COLORS.256color" ) 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
diff --git a/coreutils.spec b/coreutils.spec
index fc94073..696dd99 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -124,7 +124,7 @@ packaged as a single multicall binary.
 # yum obsoleting rules explained at:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1107973#c7
 Obsoletes: %{name} < 8.24-100
-Requires: ncurses
+Recommends: ncurses
 Summary:  coreutils common optional components
 %description common
 Optional though recommended components,
@@ -268,6 +268,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %changelog
 * Fri Jun 26 2020 James Cassell <cyberpear@fedoraproject.org> - 8.32-7
 - move ncurses to -common package since it's needed for colorls.sh
+- make ncurses optional
 
 * Fri May 15 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-6
 - compile with -Dlint to enable optional initialization and cleanup code