diff --git a/SOURCES/less-458-lesskey-usage.patch b/SOURCES/less-458-lesskey-usage.patch index c77a572..dbef8a0 100644 --- a/SOURCES/less-458-lesskey-usage.patch +++ b/SOURCES/less-458-lesskey-usage.patch @@ -18,20 +18,3 @@ diff -upr less-458_orig/lesskey.c less-458_work/lesskey.c exit(1); } -@@ -307,6 +315,8 @@ parse_args(argc, argv) - break; - case 'o': - outfile = &argv[0][2]; -+ case 'h': -+ goto opt_h; - opt_o: - if (*outfile == '\0') - { -@@ -319,6 +329,7 @@ parse_args(argc, argv) - opt_V: - printf("lesskey version %s\n", version); - exit(0); -+ opt_h: - default: - usage(); - } diff --git a/SOURCES/less-458-old-bot-in-help.patch b/SOURCES/less-458-old-bot-in-help.patch index 15e54f7..7476dfc 100644 --- a/SOURCES/less-458-old-bot-in-help.patch +++ b/SOURCES/less-458-old-bot-in-help.patch @@ -1,6 +1,18 @@ -diff -upr less-458_orig/less.hlp less-458_work/less.hlp ---- less-458_orig/less.hlp 2013-05-07 14:03:52.037104428 +0200 -+++ less-458_work/less.hlp 2013-05-07 11:24:43.475780365 +0200 +diff -up less-458/help.c.oldbothelp less-458/help.c +--- less-458/help.c.oldbothelp 2014-02-03 16:49:34.000000000 +0100 ++++ less-458/help.c 2014-02-03 16:50:17.202836595 +0100 +@@ -138,6 +138,8 @@ constant char helpdata[] = { + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','H','i','g','h','l','i','g','h','t',' ','o','n','l','y',' ','l','a','s','t',' ','m','a','t','c','h',' ','f','o','r',' ','s','e','a','r','c','h','e','s','.','\n', + ' ',' ','-','G',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','H','I','L','I','T','E','-','S','E','A','R','C','H','\n', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','o','n','\'','t',' ','h','i','g','h','l','i','g','h','t',' ','a','n','y',' ','m','a','t','c','h','e','s',' ','f','o','r',' ','s','e','a','r','c','h','e','s','.','\n', ++' ',' ','-','-','o','l','d','-','b','o','t','\n', ++' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','R','e','v','e','r','t',' ','t','o',' ','t','h','e',' ','o','l','d',' ','b','o','t','t','o','m',' ','o','f',' ','s','c','r','e','e','n',' ','b','e','h','a','v','i','o','r','.','\n', + ' ',' ','-','h',' ','[','_','\b','N',']',' ',' ','.','.','.','.',' ',' ','-','-','m','a','x','-','b','a','c','k','-','s','c','r','o','l','l','=','[','_','\b','N',']','\n', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','B','a','c','k','w','a','r','d',' ','s','c','r','o','l','l',' ','l','i','m','i','t','.','\n', + ' ',' ','-','i',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','i','g','n','o','r','e','-','c','a','s','e','\n', +diff -up less-458/less.hlp.oldbothelp less-458/less.hlp +--- less-458/less.hlp.oldbothelp 2014-02-03 16:49:34.503555646 +0100 ++++ less-458/less.hlp 2014-02-03 16:49:34.507555673 +0100 @@ -135,6 +135,8 @@ Highlight only last match for searches. -G ........ --HILITE-SEARCH diff --git a/SPECS/less.spec b/SPECS/less.spec index 962cbd3..4ed5ee8 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: 458 -Release: 4%{?dist} +Release: 8%{?dist} License: GPLv3+ Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz @@ -74,6 +74,22 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 03 2014 Jozef Mlich - 458-8 +- changes introduced in less-458-old-bot-in-help.patch + wasn't compiled in. It is necessary to use mkhelp tool. + Resolves: #948597 + +* Fri Jan 24 2014 Daniel Mach - 458-7 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 458-6 +- Mass rebuild 2013-12-27 + +* Mon Dec 02 2013 Jozef Mlich - 458-5 +- fixing regression in 72dfd3f63594e1d4c9416180a95c47ae583934c6 + incorrect parsing of commandline arguments +- Resolves #948597 + * Thu Jul 11 2013 Ondrej Vasik - 458-4 - apply the --old-bot patch (#983167) @@ -118,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT options incompatibility between man and man-db packages (#718498) - Add groff to Requires -* Mon Aug 23 2011 Vojtech Vitek (V-Teq) - 444-3 +* Tue Aug 23 2011 Vojtech Vitek (V-Teq) - 444-3 - Substitute %%makeinstall macro with make DESTDIR* install (#732557) * Fri Aug 12 2011 Vojtech Vitek (V-Teq) - 444-2 @@ -167,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Jan 4 2010 Nikola Pajkovsky - 436-5 - patched wrong manpage. Resolves: #537746. -* Mon Dec 12 2009 Nikola Pajkovsky - 436-4 +* Sat Dec 12 2009 Nikola Pajkovsky - 436-4 - #546613 - RFE: add *.jar *.nbm to lesspipe.sh * Wed Dec 9 2009 Nikola Pajkovsky - 436-3 @@ -176,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Jul 24 2009 Fedora Release Engineering - 436-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Tue Jul 10 2009 Zdenek Prikryl - 436-1 +* Fri Jul 10 2009 Zdenek Prikryl - 436-1 - Foption patch is more optimal now - Update to 436 @@ -257,7 +273,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Jul 12 2006 Jesse Keating - 394-4.1 - rebuild -* Thu May 5 2006 Ivana Varekova - 394-4 +* Fri May 05 2006 Ivana Varekova - 394-4 - fix problem with unassigned variable DECOMPRESSOR (#190619) * Wed Feb 15 2006 Ivana Varekova - 394-3 @@ -457,7 +473,7 @@ rm -rf $RPM_BUILD_ROOT - fix up lesspipe stuff (Bug #8750 and a couple of non-reported bugs) (Karsten, did I mention I'll kill you when you return from SAP? ;) ) -* Sun Jan 07 2000 Karsten Hopp +* Fri Jan 07 2000 Karsten Hopp - added lesspipe.sh to show listings of package contents instead of binary output.