From 6b7b492e3feed4fe68f25671107f760314e4ac7d Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fb.com>
Date: May 12 2021 22:30:28 +0000
Subject: Update to 581.2-1


---

diff --git a/.gitignore b/.gitignore
index 8003208..f91c7dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SOURCES/less-575.tar.gz
+SOURCES/less-581.2.tar.gz
diff --git a/.less.metadata b/.less.metadata
index 8d91df5..de2bc28 100644
--- a/.less.metadata
+++ b/.less.metadata
@@ -1 +1 @@
-44219790a343976d3c6a2198194a7baa1b68a09c SOURCES/less-575.tar.gz
+644061c665897c4cf2dd982674eda61a172c4967 SOURCES/less-581.2.tar.gz
diff --git a/SOURCES/less-475-fsync.patch b/SOURCES/less-475-fsync.patch
index 61dd45c..ce81b48 100644
--- a/SOURCES/less-475-fsync.patch
+++ b/SOURCES/less-475-fsync.patch
@@ -4,17 +4,12 @@ Date: Fri, 22 Jan 2021 09:49:13 -0500
 Subject: [PATCH] Test for fsync on tty
 
 Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
----
- configure.ac | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
 
-diff --git a/configure.ac b/configure.ac
-index 918807967473e01af6c5d78b1737c2d06f96b426..ce478adc1ea2d37c2b22eb46fc2b55d2ba49244e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -219,10 +219,12 @@ AH_TEMPLATE([HAVE_STAT_INO],
- 	[Define HAVE_STAT_INO if your struct stat has st_ino and st_dev.])
- AH_TEMPLATE([HAVE_TIME_T],
+Modified for less 581.2 Filip Januš <fjanus@redhat.com>
+diff -ur less-581.2/configure.ac less_fsync/configure.ac
+--- less-581.2/configure.ac	2021-04-28 17:00:08.000000000 +0200
++++ less_fsync/configure.ac	2021-05-06 10:59:07.560062397 +0200
+@@ -221,6 +221,8 @@
  	[Define HAVE_TIME_T if your system supports the "time_t" type.])
  AH_TEMPLATE([HAVE_STRERROR],
  	[Define HAVE_STRERROR if you have the strerror() function.])
@@ -23,24 +18,16 @@ index 918807967473e01af6c5d78b1737c2d06f96b426..ce478adc1ea2d37c2b22eb46fc2b55d2
  AH_TEMPLATE([HAVE_FILENO],
  	[Define HAVE_FILENO if you have the fileno() macro.])
  AH_TEMPLATE([HAVE_ERRNO],
- 	[Define HAVE_ERRNO if you have the errno variable.])
- AH_TEMPLATE([MUST_DEFINE_ERRNO],
-@@ -272,11 +274,11 @@ AC_MSG_CHECKING(for ANSI function prototypes)
- AC_TRY_COMPILE([], [int f(int a) { return a; }],
-   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ANSI_PROTOS)], [AC_MSG_RESULT(no)])
+@@ -274,7 +276,7 @@
  
  # Checks for library functions.
  AC_TYPE_SIGNAL
--AC_CHECK_FUNCS([fchmod fsync nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat system usleep])
-+AC_CHECK_FUNCS([fchmod nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat system usleep])
+-AC_CHECK_FUNCS([fchmod fsync nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat system ttyname usleep])
++AC_CHECK_FUNCS([fchmod nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat system ttyname usleep])
  
  # AC_CHECK_FUNCS may not work for inline functions, so test these separately.
  AC_MSG_CHECKING(for memcpy)
- AC_TRY_LINK([
- #if HAVE_STRING_H
-@@ -319,10 +321,20 @@ AC_TRY_LINK([
- #if HAVE_ERRNO_H
- #include <errno.h>
+@@ -321,6 +323,16 @@
  #endif], [static char *x; x = strerror(0);],
    [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)])
  
@@ -57,8 +44,3 @@ index 918807967473e01af6c5d78b1737c2d06f96b426..ce478adc1ea2d37c2b22eb46fc2b55d2
  AC_MSG_CHECKING(for sys_errlist)
  AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], 
    [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)])
- 
- AC_CHECK_TYPES([sigset_t],,,[#include <signal.h>])
--- 
-2.29.2
-
diff --git a/SPECS/less.spec b/SPECS/less.spec
index 2c94b81..eb9da2b 100644
--- a/SPECS/less.spec
+++ b/SPECS/less.spec
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better
 Name: less
-Version: 575
-Release: 2%{?dist}
+Version: 581.2
+Release: 1%{?dist}
 License: GPLv3+ or BSD
 Source0: https://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
 Source1: lesspipe.sh
@@ -63,6 +63,9 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 %{_mandir}/man1/*
 
 %changelog
+* Thu May 6 2021 Filip Januš <fjanus@redhat.com> - 581.2-1
+- Rebase to 581.2-1
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 575-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild