- updated to 394

Changed files:
    less-DESTDIR.patch -> 1.3
    less-libtinfo.patch -> 1.3
    less-shell.patch -> 1.3
    less.spec -> 1.75

diff --git a/less-DESTDIR.patch b/less-DESTDIR.patch
index f67a4c7de25fc0f1044a927b7b342ddcf0ded97f..8d241f7935d50d8467dfb6cd15abe57bb9a85a36 100644 (file)
--- a/less-DESTDIR.patch
+++ b/less-DESTDIR.patch
@@ -10,33 +10,37 @@ diff -Nru less-346/Makefile.in less-346.new/Makefile.in
  #### End of system configuration section. ####
  
  SHELL = /bin/sh
-@@ -58,21 +60,21 @@
+--- less-394/Makefile.in~      2006-02-23 01:47:09.000000000 +0200
++++ less-394/Makefile.in       2006-02-23 01:48:38.000000000 +0200
+@@ -62,22 +62,22 @@
  ${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h 
  
- install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro installdirs
+ install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs
 -      ${INSTALL_PROGRAM} less ${bindir}/${binprefix}less
 -      ${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey
 -      ${INSTALL_PROGRAM} lessecho ${bindir}/${binprefix}lessecho
 -      ${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/man${manext}/${manprefix}less.${manext}
 -      ${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/man${manext}/${manprefix}lesskey.${manext}
-+      ${INSTALL_PROGRAM} less $(DESTDIR)$(bindir)/${binprefix}less
-+      ${INSTALL_PROGRAM} lesskey $(DESTDIR)$(bindir)/${binprefix}lesskey
-+      ${INSTALL_PROGRAM} lessecho $(DESTDIR)$(bindir)/${binprefix}lessecho
-+      ${INSTALL_DATA} ${srcdir}/less.nro $(DESTDIR)$(mandir)/man${manext}/${manprefix}less.${manext}
-+      ${INSTALL_DATA} ${srcdir}/lesskey.nro $(DESTDIR)$(mandir)/man${manext}/${manprefix}lesskey.${manext}
+-      ${INSTALL_DATA} ${srcdir}/lessecho.nro ${mandir}/man${manext}/${manprefix}lessecho.${manext}
++      ${INSTALL_PROGRAM} less $(DESTDIR)${bindir}/${binprefix}less
++      ${INSTALL_PROGRAM} lesskey $(DESTDIR)${bindir}/${binprefix}lesskey
++      ${INSTALL_PROGRAM} lessecho $(DESTDIR)${bindir}/${binprefix}lessecho
++      ${INSTALL_DATA} ${srcdir}/less.nro $(DESTDIR)${mandir}/man${manext}/${manprefix}less.${manext}
++      ${INSTALL_DATA} ${srcdir}/lesskey.nro $(DESTDIR)${mandir}/man${manext}/${manprefix}lesskey.${manext}
++      ${INSTALL_DATA} ${srcdir}/lessecho.nro $(DESTDIR)${mandir}/man${manext}/${manprefix}lessecho.${manext}
  
  install-strip:
        ${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install
  
  installdirs: mkinstalldirs
 -      ${srcdir}/mkinstalldirs ${bindir} ${mandir}/man${manext}
-+      ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man${manext}
++      ${srcdir}/mkinstalldirs $(DESTDIR)${bindir} $(DESTDIR)${mandir}/man${manext}
  
  uninstall:
 -      rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey ${bindir}/${binprefix}lessecho
 -      rm -f ${mandir}/man${manext}/${manprefix}less.${manext} ${mandir}/man${manext}/${manprefix}lesskey.${manext}
-+      rm -f $(DESTDIR)$(bindir)/${binprefix}less $(DESTDIR)$(bindir)/${binprefix}lesskey $(DESTDIR)$(bindir)/${binprefix}lessecho
-+      rm -f $(DESTDIR)$(mandir)/man${manext}/${manprefix}less.${manext} $(DESTDIR)$(mandir)/man${manext}/${manprefix}lesskey.${manext}
++      rm -f $(DESTDIR)${bindir}/${binprefix}less $(DESTDIR)${bindir}/${binprefix}lesskey $(DESTDIR)${bindir}/${binprefix}lessecho
++      rm -f $(DESTDIR)${mandir}/man${manext}/${manprefix}less.${manext} $(DESTDIR)${mandir}/man${manext}/${manprefix}lesskey.${manext}
  
  info:
  install-info:

diff --git a/less-libtinfo.patch b/less-libtinfo.patch
index 512f55d2da86c98d4d9c3ee93c46fff411ad0b3d..50c52070ab3a6fd9c86a850bae471b2cbf0c5caf 100644 (file)
--- a/less-libtinfo.patch
+++ b/less-libtinfo.patch
@@ -1,13 +1,15 @@
---- lesso/configure.ac Sat Jan 18 05:55:15 2003
-+++ less/configure.ac  Sun Feb 16 22:28:19 2003
-@@ -23,9 +23,9 @@
+--- less-394/configure.ac~     2006-02-23 01:51:08.000000000 +0200
++++ less-394/configure.ac      2006-02-23 01:51:54.000000000 +0200
+@@ -23,10 +23,10 @@
  AC_SYS_LARGEFILE
  
  # Checks for general libraries.
 -AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
+-AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no])
 -AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
 -AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no])
 +AC_CHECK_LIB(xcurses, tgetent, [have_xcurses=yes], [have_xcurses=no])
++AC_CHECK_LIB(ncursesw, tgetent, [have_ncursesw=yes], [have_ncursesw=no])
 +AC_CHECK_LIB(ncurses, tgetent, [have_ncurses=yes], [have_ncurses=no])
 +AC_CHECK_LIB(curses, tgetent, [have_curses=yes], [have_curses=no])
  AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no])

diff --git a/less-shell.patch b/less-shell.patch
index 6109af09ef56507defdb54ca12204e9a283073a5..9b56388e881db679c0eecd0f935ae6f7d93cc1e7 100644 (file)
--- a/less-shell.patch
+++ b/less-shell.patch
@@ -1,6 +1,6 @@
---- less-374/filename.c~       Wed Mar  6 14:54:12 2002
-+++ less-374/filename.c        Wed Mar  6 14:56:58 2002
-@@ -550,37 +550,7 @@
+--- less-394/filename.c~       2006-02-23 01:49:12.000000000 +0200
++++ less-394/filename.c        2006-02-23 01:50:36.000000000 +0200
+@@ -557,37 +557,7 @@
  {
        FILE *fd;
  
@@ -23,9 +23,9 @@
 -                      fd = popen(cmd, "r");
 -              } else
 -              {
--                      scmd = (char *) ecalloc(strlen(shell) + strlen(esccmd) + 5,
--                                              sizeof(char));
--                      sprintf(scmd, "%s %s %s", shell, shell_coption(), esccmd);
+-                      int len = strlen(shell) + strlen(esccmd) + 5;
+-                      scmd = (char *) ecalloc(len, sizeof(char));
+-                      SNPRINTF3(scmd, len, "%s %s %s", shell, shell_coption(), esccmd);
 -                      free(esccmd);
 -                      fd = popen(scmd, "r");
 -                      free(scmd);

diff --git a/less.spec b/less.spec
index b0255c1752c313f8c76d139dfec51bc8fa970873..3992ecb85ce89fbf6763b05589d1b79882e749c2 100644 (file)
--- a/less.spec
+++ b/less.spec
@@ -9,12 +9,12 @@ Summary(ru):  
 Summary(tr):   Metin dosyasý görüntüleyici - more benzeri
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÐÅÒÅÇÌÑÄÕ ÔÅËÓÔÏ×ÉÈ ÆÁÊÌ¦× ÓÈÏÖÁ ÎÁ more, ÁÌÅ ËÒÁÝÁ
 Name:          less
-Version:       382
-Release:       7
+Version:       394
+Release:       1
 License:       GPL v2
 Group:         Applications/Text
-Source0:       ftp://ftp.gnu.org/gnu/less/%{name}-%{version}.tar.gz
-# Source0-md5: 103fe4aef6297b93f0f73f38cc3b1bd7
+Source0:       http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
+# Source0-md5: a9f072ccefa0d315b325f3e9cdbd4b97
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 07bb76556307ab4cecba7abd3933bad2
 Source2:       %{name}pipe.sh
@@ -23,7 +23,6 @@ Patch0:               %{name}-DESTDIR.patch
 Patch1:                %{name}-shell.patch
 Patch2:                %{name}-edit.patch
 Patch3:                %{name}-libtinfo.patch
-Patch4:                %{name}-locale-charmap.patch
 URL:           http://www.greenwoodsoftware.com/less/
 BuildRequires: autoconf
 BuildRequires: ncurses-devel >= 5.0
@@ -80,7 +79,6 @@ sa
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 chmod -R u+w .