From 79b940a55b023f1b38f8001c51a1d8bf5475d0a7 Mon Sep 17 00:00:00 2001 From: Vojtech Vitek (V-Teq) Date: Dec 22 2010 13:07:18 +0000 Subject: - The new "--old-bot" option is not documented in the man page Resolves: #510724 - Fix descriptions of some options in online help Resolves: #578289 (Jeff Bastian )[IT603793] --- diff --git a/less-436-help.patch b/less-436-help.patch new file mode 100644 index 0000000..09821c3 --- /dev/null +++ b/less-436-help.patch @@ -0,0 +1,50 @@ +diff --git a/help.c b/help.c +index 531aa16..0de6f0f 100644 +--- a/help.c ++++ b/help.c +@@ -119,7 +119,7 @@ constant char helpdata[] = { + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','N','u','m','b','e','r',' ','o','f',' ','b','u','f','f','e','r','s','.','\n', + ' ',' ','-','B',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','a','u','t','o','-','b','u','f','f','e','r','s','\n', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','o','n','\'','t',' ','a','u','t','o','m','a','t','i','c','a','l','l','y',' ','a','l','l','o','c','a','t','e',' ','b','u','f','f','e','r','s',' ','f','o','r',' ','p','i','p','e','s','.','\n', +-' ',' ','-','c',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','c','l','e','a','r','-','s','c','r','e','e','n','\n', ++' ',' ','-','c',' ',' ','-','C',' ',' ','.','.','.','.',' ',' ','-','-','c','l','e','a','r','-','s','c','r','e','e','n',' ','-','-','C','L','E','A','R','-','S','C','R','E','E','N','\n', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','R','e','p','a','i','n','t',' ','b','y',' ','c','l','e','a','r','i','n','g',' ','r','a','t','h','e','r',' ','t','h','a','n',' ','s','c','r','o','l','l','i','n','g','.','\n', + ' ',' ','-','d',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','d','u','m','b','\n', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','u','m','b',' ','t','e','r','m','i','n','a','l','.','\n', +@@ -151,8 +151,10 @@ constant char helpdata[] = { + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','I','g','n','o','r','e',' ','t','h','e',' ','L','E','S','S','O','P','E','N',' ','e','n','v','i','r','o','n','m','e','n','t',' ','v','a','r','i','a','b','l','e','.','\n', + ' ',' ','-','m',' ',' ','-','M',' ',' ','.','.','.','.',' ',' ','-','-','l','o','n','g','-','p','r','o','m','p','t',' ',' ','-','-','L','O','N','G','-','P','R','O','M','P','T','\n', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','S','e','t',' ','p','r','o','m','p','t',' ','s','t','y','l','e','.','\n', +-' ',' ','-','n',' ',' ','-','N',' ',' ','.','.','.','.',' ',' ','-','-','l','i','n','e','-','n','u','m','b','e','r','s',' ',' ','-','-','L','I','N','E','-','N','U','M','B','E','R','S','\n', ++' ',' ','-','n',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','l','i','n','e','-','n','u','m','b','e','r','s','\n', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','o','n','\'','t',' ','u','s','e',' ','l','i','n','e',' ','n','u','m','b','e','r','s','.','\n', ++' ',' ','-','N',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','L','I','N','E','-','N','U','M','B','E','R','S','\n', ++' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','U','s','e',' ','l','i','n','e',' ','n','u','m','b','e','r','s','.','\n', + ' ',' ','-','o',' ','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']',' ',' ','.',' ',' ','-','-','l','o','g','-','f','i','l','e','=','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']','\n', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','C','o','p','y',' ','t','o',' ','l','o','g',' ','f','i','l','e',' ','(','s','t','a','n','d','a','r','d',' ','i','n','p','u','t',' ','o','n','l','y',')','.','\n', + ' ',' ','-','O',' ','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']',' ',' ','.',' ',' ','-','-','L','O','G','-','F','I','L','E','=','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']','\n', +diff --git a/less.hlp b/less.hlp +index 15ece5a..186e409 100644 +--- a/less.hlp ++++ b/less.hlp +@@ -116,7 +116,7 @@ + Number of buffers. + -B ........ --auto-buffers + Don't automatically allocate buffers for pipes. +- -c ........ --clear-screen ++ -c -C .... --clear-screen --CLEAR-SCREEN + Repaint by clearing rather than scrolling. + -d ........ --dumb + Dumb terminal. +@@ -148,8 +148,10 @@ + Ignore the LESSOPEN environment variable. + -m -M .... --long-prompt --LONG-PROMPT + Set prompt style. +- -n -N .... --line-numbers --LINE-NUMBERS ++ -n ........ --line-numbers + Don't use line numbers. ++ -N ........ --LINE-NUMBERS ++ Use line numbers. + -o [_f_i_l_e] . --log-file=[_f_i_l_e] + Copy to log file (standard input only). + -O [_f_i_l_e] . --LOG-FILE=[_f_i_l_e] diff --git a/less-436-manpage-add-old-bot-option.patch b/less-436-manpage-add-old-bot-option.patch new file mode 100644 index 0000000..a3c76d7 --- /dev/null +++ b/less-436-manpage-add-old-bot-option.patch @@ -0,0 +1,13 @@ +--- less-436/less.nro.old-bot 2010-01-05 15:20:00.690985900 +0100 ++++ less-436/less.nro 2010-01-05 15:16:30.500112556 +0100 +@@ -555,6 +555,10 @@ This can cause + to run somewhat faster than the default. + .IP "\-G or \-\-HILITE-SEARCH" + The \-G option suppresses all highlighting of strings found by search commands. ++.IP "\-\-old-bot" ++Reverts to the old bottom of screen behavior. This can be sometimes ++desirable if the long lines are not wrapped correctly ++when reaching the bottom of the terminal, while scrolling forward. + .IP "\-h\fIn\fP or \-\-max-back-scroll=\fIn\fP" + Specifies a maximum number of lines to scroll backward. + If it is necessary to scroll backward more than \fIn\fP lines, diff --git a/less-436-manpage-del-extra-line.patch b/less-436-manpage-del-extra-line.patch new file mode 100644 index 0000000..020e54c --- /dev/null +++ b/less-436-manpage-del-extra-line.patch @@ -0,0 +1,10 @@ +--- less-436/less.nro.manpage 2009-07-08 00:27:21.000000000 +0200 ++++ less-436/less.nro 2010-01-04 14:45:16.979806602 +0100 +@@ -1290,7 +1290,6 @@ The remainder of LESSBINFMT is a string + printf-style escape sequence (a % followed by x, X, o, d, etc.). + For example, if LESSBINFMT is "*u[%x]", binary characters + are displayed in underlined hexadecimal surrounded by brackets. +-The default if no LESSBINFMT is specified is "*s<%X>". + The default if no LESSBINFMT is specified is "*s<%02X>". + Warning: the result of expanding the character via LESSBINFMT must + be less than 31 characters. diff --git a/less-436-manpage.patch b/less-436-manpage.patch deleted file mode 100644 index 020e54c..0000000 --- a/less-436-manpage.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- less-436/less.nro.manpage 2009-07-08 00:27:21.000000000 +0200 -+++ less-436/less.nro 2010-01-04 14:45:16.979806602 +0100 -@@ -1290,7 +1290,6 @@ The remainder of LESSBINFMT is a string - printf-style escape sequence (a % followed by x, X, o, d, etc.). - For example, if LESSBINFMT is "*u[%x]", binary characters - are displayed in underlined hexadecimal surrounded by brackets. --The default if no LESSBINFMT is specified is "*s<%X>". - The default if no LESSBINFMT is specified is "*s<%02X>". - Warning: the result of expanding the character via LESSBINFMT must - be less than 31 characters. diff --git a/less.spec b/less.spec index 87ec4ad..fd7db28 100644 --- a/less.spec +++ b/less.spec @@ -1,7 +1,7 @@ Summary: A text file browser similar to more, but better Name: less Version: 436 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz @@ -11,8 +11,11 @@ Source3: less.csh Patch1: less-406-Foption.patch Patch4: less-394-time.patch Patch5: less-418-fsync.patch -Patch6: less-436-manpage.patch -Patch7: less-436-empty-lessopen-pipe.patch +Patch6: less-436-manpage-add-old-bot-option.patch +Patch7: less-436-manpage-del-extra-line.patch +Patch8: less-436-help.patch +Patch9: less-436-empty-lessopen-pipe.patch + URL: http://www.greenwoodsoftware.com/less/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -34,8 +37,10 @@ files, and you'll use it frequently. %patch1 -p1 -b .Foption %patch4 -p1 -b .time %patch5 -p1 -b .fsync -%patch6 -p1 -b .manpage -%patch7 -p1 -b .empty-lessopen-pipe +%patch6 -p1 -b .manpage-add-old-bot-option +%patch7 -p1 -b .manpage-del-extra-line +%patch8 -p1 -b .help +%patch9 -p1 -b .empty-lessopen-pipe autoreconf @@ -67,6 +72,12 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 22 2010 Vojtech Vitek (V-Teq) - 436-8 +- The new "--old-bot" option is not documented in the man page + Resolves: #510724 +- Fix descriptions of some options in online help + Resolves: #578289 (Jeff Bastian )[IT603793] + * Tue Dec 21 2010 Vojtech Vitek (V-Teq) - 436-7 - Fix for valid empty LESSOPEN pipe output Resolves: #579251, #615303