diff --git a/.gitignore b/.gitignore index 2b2dfb1..e4ba155 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -less-436.tar.gz +/less-436.tar.gz +/less-443.tar.gz diff --git a/less-436-manpage-del-extra-line.patch b/less-436-manpage-del-extra-line.patch deleted file mode 100644 index 020e54c..0000000 --- a/less-436-manpage-del-extra-line.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-406-Foption.patch b/less-443-Foption.patch similarity index 90% rename from less-406-Foption.patch rename to less-443-Foption.patch index f81e4ce..d657d44 100644 --- a/less-406-Foption.patch +++ b/less-443-Foption.patch @@ -1,13 +1,15 @@ +--- less-443/main.c.orig 2011-04-20 12:00:59.624710415 +0200 ++++ less-443/main.c 2011-04-20 12:02:47.273436639 +0200 +@@ -55,6 +55,7 @@ static char consoleTitle[256]; + #endif + + extern int less_is_more; ++public int line_count; + extern int missing_cap; + extern int know_dumb; + extern int quit_if_one_screen; --- less-406/main.c.Foption 2007-06-17 18:56:04.000000000 +0200 +++ less-406/main.c 2008-01-11 10:18:46.000000000 +0100 -@@ -33,6 +33,7 @@ public int quitting; - public int secure; - public int dohelp; - public int less_is_more; -+public int line_count; - - #if LOGFILE - public int logfile = -1; @@ -280,6 +281,16 @@ main(argc, argv) { if (edit_first()) /* Edit first valid file in cmd line */ @@ -103,3 +105,4 @@ + return nlines; +} + + diff --git a/less.spec b/less.spec index 7ffeb3b..4b79329 100644 --- a/less.spec +++ b/less.spec @@ -1,21 +1,19 @@ Summary: A text file browser similar to more, but better Name: less -Version: 436 -Release: 13%{?dist} +Version: 443 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz Source1: lesspipe.sh Source2: less.sh Source3: less.csh -Patch1: less-406-Foption.patch +Patch1: less-443-Foption.patch Patch4: less-394-time.patch Patch5: less-418-fsync.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 @@ -38,7 +36,6 @@ files, and you'll use it frequently. %patch4 -p1 -b .time %patch5 -p1 -b .fsync %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 @@ -72,6 +69,12 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 20 2011 Vojtech Vitek (V-Teq) - 443-1 +- Rebase to 443 +- Foption patch made applicable against 443 +- Manpage extra line patch removed; fixed upstream + Resolves: #697451 + * Wed Apr 13 2011 Vojtech Vitek (V-Teq) - 436-13 - Don't convert files with UTF-16/UTF-32 string in filename Resolve: #638312 diff --git a/sources b/sources index 096f8e6..6edad14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -817bf051953ad2dea825a1cdf460caa4 less-436.tar.gz +47db098fb3cdaf847b3c4be05ee954fc less-443.tar.gz