diff --git a/.cvsignore b/.cvsignore index 81a835f..9e7fc0b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -less-406.tar.gz +less-409.tar.gz diff --git a/less-382-fixline.patch b/less-382-fixline.patch deleted file mode 100644 index ca3ca57..0000000 --- a/less-382-fixline.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- less-394/jump.c.fixline 2005-12-03 21:20:32.000000000 +0100 -+++ less-394/jump.c 2006-01-16 15:12:00.000000000 +0100 -@@ -30,7 +30,7 @@ - public void - jump_forw() - { -- POSITION pos; -+ POSITION pos, end_pos; - - if (ch_end_seek()) - { -@@ -42,11 +42,15 @@ jump_forw() - * Go back one line from the end of the file - * to get to the beginning of the last line. - */ -- pos = back_line(ch_tell()); -+ pos = back_line(end_pos = ch_tell()); - if (pos == NULL_POSITION) - jump_loc((POSITION)0, sc_height-1); - else -+ { - jump_loc(pos, sc_height-1); -+ if (position(sc_height-1) != end_pos) -+ repaint(); -+ } - } - - /* diff --git a/less-394-goend.patch b/less-394-goend.patch deleted file mode 100644 index 34166e1..0000000 --- a/less-394-goend.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- less-394/jump.c.goend 2006-10-25 11:04:49.000000000 +0200 -+++ less-394/jump.c 2006-10-25 11:31:47.000000000 +0200 -@@ -42,7 +42,9 @@ - * Go back one line from the end of the file - * to get to the beginning of the last line. - */ -+ pos_clear(); - pos = back_line(end_pos = ch_tell()); -+ - if (pos == NULL_POSITION) - jump_loc((POSITION)0, sc_height-1); - else diff --git a/less.spec b/less.spec index a664421..ed09d69 100644 --- a/less.spec +++ b/less.spec @@ -1,23 +1,21 @@ Summary: A text file browser similar to more, but better Name: less -Version: 406 -Release: 12%{?dist} +Version: 409 +Release: 1%{?dist} License: BSD 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-fixline.patch Patch1: less-406-Foption.patch -Patch3: less-394-goend.patch Patch4: less-394-time.patch - URL: http://www.greenwoodsoftware.com/less/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: which BuildRequires: ncurses-devel BuildRequires: pcre-devel +BuildRequires: autoconf %description The less utility is a text file browser that resembles more, but has @@ -31,9 +29,7 @@ files, and you'll use it frequently. %prep %setup -q -%patch0 -p1 -b .fixline %patch1 -p1 -b .Foption -%patch3 -p1 -b .goend %patch4 -p1 -b .time chmod -R a+w * chmod 644 lessecho.c lesskey.c version.c LICENSE @@ -63,6 +59,11 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 22 2007 Ivana Varekova - 409-1 +- upgrade to 409 +- remove useless/obsolete patches +- add autoconf buildrequires + * Mon Oct 1 2007 Ivana Varekova - 406-12 - change license tag - fix 312591 - add which dependency diff --git a/sources b/sources index 247ba0f..7f2048c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6062663b5be92dfcdfd6300ba0811e4 less-406.tar.gz +32f4e9d9b86b2a16be85057f588bd965 less-409.tar.gz