rpms/less/FC-4 less-382-fixline.patch, NONE, 1.1 less-392-Foption.patch, NONE, 1.1 less.spec, 1.19, 1.20 sources, 1.5, 1.6 less-382-ncursesw.patch, 1.1, NONE less-382-utf8detect.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/less/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7155

Modified Files:
	less.spec sources 
Added Files:
	less-382-fixline.patch less-392-Foption.patch 
Removed Files:
	less-382-ncursesw.patch less-382-utf8detect.patch 
Log Message:
* Mon Jan  9 2006 Jindrich Novy <jnovy at redhat.com> 394-1
- update to less-394
- new less comes with much better UTF-8 support (#177255)


less-382-fixline.patch:
 command.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE less-382-fixline.patch ---
--- less-382/command.c.fixline	2004-02-04 05:52:26.000000000 +0100
+++ less-382/command.c	2005-09-05 09:24:03.000000000 +0200
@@ -1168,6 +1168,7 @@
 				jump_forw();
 			else
 				jump_back(number);
+			repaint();
 			break;
 
 		case A_GOPOS:

less-392-Foption.patch:
 screen.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE less-392-Foption.patch ---
--- less-392/screen.c.Foption	2005-09-17 19:17:02.000000000 +0200
+++ less-392/screen.c	2005-10-21 16:25:16.000000000 +0200
@@ -233,6 +233,7 @@ extern int wscroll;
 extern int screen_trashed;
 extern int tty;
 extern int top_scroll;
+extern int quit_if_one_screen;
 #if HILITE_SEARCH
 extern int hilite_search;
 #endif
@@ -1547,7 +1548,7 @@ deinit()
 #if !MSDOS_COMPILER
 	if (!no_keypad)
 		tputs(sc_e_keypad, sc_height, putchr);
-	if (!no_init)
+	if (!no_init && !quit_if_one_screen)
 		tputs(sc_deinit, sc_height, putchr);
 #else
 	/* Restore system colors. */


Index: less.spec
===================================================================
RCS file: /cvs/dist/rpms/less/FC-4/less.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- less.spec	4 Mar 2005 13:57:55 -0000	1.19
+++ less.spec	9 Jan 2006 13:12:07 -0000	1.20
@@ -1,16 +1,15 @@
 Summary: A text file browser similar to more, but better.
 Name: less
-Version: 382
-Release: 7
+Version: 394
+Release: 1.fc4
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
 Source1: lesspipe.sh
 Source2: less.sh
 Source3: less.csh
-
-Patch0:	less-382-ncursesw.patch
-Patch1:	less-382-utf8detect.patch
+Patch0: less-382-fixline.patch
+Patch1: less-392-Foption.patch
 
 URL: http://www.greenwoodsoftware.com/less/
 Buildroot: %{_tmppath}/%{name}-root
@@ -28,8 +27,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ncursesw
-%patch1 -p1 -b .utf8detect
+%patch0 -p1 -b .fixline
+%patch1 -p1 -b .Foption
 chmod -R a+w *
 
 %build
@@ -55,6 +54,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jan  9 2006 Jindrich Novy <jnovy at redhat.com> 394-1
+- update to less-394
+- new less comes with much better UTF-8 support (#177255)
+
 * Fri Mar  4 2005 Jindrich Novy <jnovy at redhat.com> 382-7
 - rebuilt with gcc4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/less/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2004 07:16:06 -0000	1.5
+++ sources	9 Jan 2006 13:12:07 -0000	1.6
@@ -1 +1 @@
-103fe4aef6297b93f0f73f38cc3b1bd7  less-382.tar.gz
+a9f072ccefa0d315b325f3e9cdbd4b97  less-394.tar.gz


--- less-382-ncursesw.patch DELETED ---


--- less-382-utf8detect.patch DELETED ---