rpms/less/devel .cvsignore, 1.6, 1.7 less-392-Foption.patch, 1.1, 1.2 less.spec, 1.22, 1.23 sources, 1.6, 1.7 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/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18984

Modified Files:
	.cvsignore less-392-Foption.patch less.spec sources 
Removed Files:
	less-382-ncursesw.patch less-382-utf8detect.patch 
Log Message:
- update to less-393
- groom Foption patch a bit
- remove obsolete ncursesw and utf8detect patches




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/less/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Oct 2005 10:39:46 -0000	1.6
+++ .cvsignore	7 Nov 2005 09:45:12 -0000	1.7
@@ -1,2 +1,3 @@
 less-382.tar.gz
 less-392.tar.gz
+less-393.tar.gz

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

Index: less-392-Foption.patch
===================================================================
RCS file: /cvs/dist/rpms/less/devel/less-392-Foption.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- less-392-Foption.patch	21 Oct 2005 14:42:56 -0000	1.1
+++ less-392-Foption.patch	7 Nov 2005 09:45:13 -0000	1.2
@@ -1,17 +1,19 @@
---- less-392/screen.c.rasold	2005-10-21 13:54:22.000000000 +0200
-+++ less-392/screen.c	2005-10-21 13:57:58.000000000 +0200
-@@ -1547,8 +1547,12 @@
+--- 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)
--		tputs(sc_deinit, sc_height, putchr);
-+	if (!no_init){
-+		extern int quit_if_one_screen;
-+		if(quit_if_one_screen == FALSE){
-+			tputs(sc_deinit, sc_height, putchr);
-+		}
-+	}
++	if (!no_init && !quit_if_one_screen)
+ 		tputs(sc_deinit, sc_height, putchr);
  #else
  	/* Restore system colors. */
- 	SETCOLORS(sy_fg_color, sy_bg_color);


Index: less.spec
===================================================================
RCS file: /cvs/dist/rpms/less/devel/less.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- less.spec	21 Oct 2005 14:42:56 -0000	1.22
+++ less.spec	7 Nov 2005 09:45:13 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better.
 Name: less
-Version: 392
-Release: 2
+Version: 393
+Release: 1
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -54,6 +54,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Nov  7 2005 Jindrich Novy <jnovy at redhat.com> 393-1
+- update to less-393
+- groom Foption patch a bit
+- remove obsolete ncursesw and utf8detect patches
+
 * Fri Oct 21 2005 Jindrich Novy <jnovy at redhat.com> 392-2
 - fix the -F option (#79650), thanks to Petr Raszyk
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/less/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Oct 2005 10:39:46 -0000	1.6
+++ sources	7 Nov 2005 09:45:13 -0000	1.7
@@ -1 +1 @@
-462f6b0be88f25673a0ed4ddfdab803a  less-392.tar.gz
+5966fb99d0dc48ef9d03110cd699063e  less-393.tar.gz


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


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