From a7cfed4c4cad5b2f62886aca5c0c68df7d723e3a Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Jun 26 2007 10:09:21 +0000 Subject: - update to 406 --- diff --git a/.cvsignore b/.cvsignore index 9175fad..81a835f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -less-394.tar.gz +less-406.tar.gz diff --git a/less-392-Foption.patch b/less-392-Foption.patch deleted file mode 100644 index 16913d9..0000000 --- a/less-392-Foption.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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. */ diff --git a/less-406-Foption.patch b/less-406-Foption.patch new file mode 100644 index 0000000..617ef56 --- /dev/null +++ b/less-406-Foption.patch @@ -0,0 +1,19 @@ +--- less-406/screen.c.pom 2007-06-17 18:56:04.000000000 +0200 ++++ less-406/screen.c 2007-06-26 11:10:56.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; + extern int oldbot; + #if HILITE_SEARCH + extern int hilite_search; +@@ -1573,7 +1574,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. */ diff --git a/less.spec b/less.spec index 6bbee70..5c5437a 100644 --- a/less.spec +++ b/less.spec @@ -1,6 +1,6 @@ Summary: A text file browser similar to more, but better Name: less -Version: 394 +Version: 406 Release: 10%{?dist} License: GPL Group: Applications/Text @@ -9,7 +9,7 @@ Source1: lesspipe.sh Source2: less.sh Source3: less.csh Patch0: less-382-fixline.patch -Patch1: less-392-Foption.patch +Patch1: less-406-Foption.patch Patch2: less-394-search.patch Patch3: less-394-goend.patch Patch4: less-394-time.patch @@ -63,11 +63,13 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog -* Mon Jun 4 2007 Ivana Vraekova - 394-10 +* Tue Jun 26 2007 Ivana Varekova - 406-1 +- update to 406 + +* Mon Jun 4 2007 Ivana Varekova - 394-10 - Resolves: #242077 remove "-" option from lesspipe.sh script - * Tue Feb 20 2007 Ivana Varekova - 394-9 - change /etc/profile.d script's permissions diff --git a/sources b/sources index 329638b..247ba0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9f072ccefa0d315b325f3e9cdbd4b97 less-394.tar.gz +c6062663b5be92dfcdfd6300ba0811e4 less-406.tar.gz