From 0afec3ccda540e7583a77ebefd23e51284b3b23a Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Mon, 27 Jan 2025 16:23:37 +0100
Subject: [PATCH] updated to 668 (#2342067)

---
 .gitignore             |  1 +
 less-661-pipefix.patch | 20 --------------------
 less.spec              | 11 +++++------
 sources                |  2 +-
 4 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 less-661-pipefix.patch

diff --git a/.gitignore b/.gitignore
index d98e5ac..6fe5e3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /less-633.tar.gz
 /less-643.tar.gz
 /less-661.tar.gz
+/less-668.tar.gz
diff --git a/less-661-pipefix.patch b/less-661-pipefix.patch
deleted file mode 100644
index e82d2e1..0000000
--- a/less-661-pipefix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up less-661/os.c.pipefix less-661/os.c
---- less-661/os.c.pipefix	2024-06-29 19:16:08.000000000 +0200
-+++ less-661/os.c	2024-08-10 08:06:14.762224766 +0200
-@@ -80,6 +80,7 @@ extern int exit_F_on_close;
- extern int follow_mode;
- extern int scanning_eof;
- extern char intr_char;
-+extern int is_tty;
- #if !MSDOS_COMPILER
- extern int tty;
- #endif
-@@ -237,7 +238,7 @@ start:
- 	}
- #endif
- #if USE_POLL
--	if (fd != tty && use_poll)
-+	if (is_tty && fd != tty && use_poll)
- 	{
- 		int ret = check_poll(fd, tty);
- 		if (ret != 0)
diff --git a/less.spec b/less.spec
index 7e39c87..8ada576 100644
--- a/less.spec
+++ b/less.spec
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better
 Name: less
-Version: 661
-Release: 2%{?dist}
+Version: 668
+Release: 1%{?dist}
 License: GPL-3.0-only and BSD-2-Clause
 Source0: https://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
 Source1: lesspipe.sh
@@ -14,9 +14,6 @@ Patch8: less-458-lessecho-usage.patch
 Patch9: less-458-less-filters-man.patch
 Patch10: less-458-lesskey-usage.patch
 Patch11: less-458-old-bot-in-help.patch
-# from upstream, for <=661, fixes regression in file-types sanity chack post v590
-# https://github.com/gwsw/less/commit/ed454a217da417dc052723ea70da8efde0f2e66c
-Patch12: less-661-pipefix.patch
 Patch13: less-436-help.patch
 URL: https://www.greenwoodsoftware.com/less/
 BuildRequires: ncurses-devel
@@ -42,7 +39,6 @@ files, and you'll use it frequently.
 %patch -P 9 -p1 -b .less-filters-man
 %patch -P 10 -p1 -b .lesskey-usage
 %patch -P 11 -p1 -b .old-bot
-%patch -P 12 -p1 -b .pipefix
 %patch -P 13 -p1 -b .help
 
 
@@ -67,6 +63,9 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 18 2024 Michal Hlavinka <mhlavink@redhat.com> - 668-1
+- updated to 668 (#2342067)
+
 * Mon Aug 12 2024 Michal Hlavinka <mhlavink@redhat.com> - 661-2
 - fix post-v590 regression causing reading only part of pipe when stdin is null (upstream#558)
 
diff --git a/sources b/sources
index b958d5f..55219e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (less-661.tar.gz) = 49d81ff9e79d43ce0271490e3bffd590b4aed5fcb387bc8eb3128de99e5b5a5ede2e2818b546f6e3a140fa6261f1de3dfba1231f7ff7ef18502bb7030eaea1b5
+SHA512 (less-668.tar.gz) = 6527741a609849ec27b6ab35de46f2c5c2b2771391e3efe263207bee28915946f44331a42f832a7cb42231a19b135cbadc15ae02cd997b83a13cdfbc7213fc27