From bf922817841257c6ca162f5b0e2074557430a96f Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:12:13 +0000 Subject: [PATCH] auto-import changelog data from less-358-16.src.rpm Mon Feb 05 2001 Yukihiro Nakai - Update less.sh, less.csh to set JLESSCHARSET=japanese when LANG=ja?? Mon Feb 05 2001 Matt Wilson - changed the less-358+iso247-20001210.diff patch to use strcasecmp when comparing locale names Thu Feb 01 2001 Karsten Hopp - fixed character translations (bugzilla #24463) Wed Jan 31 2001 Karsten Hopp - fixed lesspipe (bugzilla #17456 #25324) Tue Dec 12 2000 Bernhard Rosenkraenzer - rebuild with new ncurses Mon Dec 11 2000 Yukihiro Nakai - Add Japanese patch with ia64 support. Mon Nov 27 2000 Karsten Hopp - rebuild with new ncurses - fix Bug #21288 Mon Nov 13 2000 Karsten Hopp - fixed handling of manpages of type *.1x.gz - added support for cpio packages Thu Sep 14 2000 Than Ngo - added new lesspipe.sh (Bug #17456) --- less.csh | 6 ++++++ less.sh | 5 +++++ less.spec | 52 ++++++++++++++++++++++++++++++++++++++-------------- lesspipe.sh | 53 +++++++++++++++++++++++++---------------------------- 4 files changed, 74 insertions(+), 42 deletions(-) diff --git a/less.csh b/less.csh index 709dc2d..7f899c5 100755 --- a/less.csh +++ b/less.csh @@ -2,3 +2,9 @@ if ( -x /usr/bin/lesspipe.sh ) then setenv LESSOPEN "|/usr/bin/lesspipe.sh %s" endif + +if ( $?LANG ) then + if ( `echo $LANG | cut -b 1-2` == "ja" ) then + setenv JLESSCHARSET japanese + endif +endif diff --git a/less.sh b/less.sh index a7569fb..3cfcb0c 100755 --- a/less.sh +++ b/less.sh @@ -1,2 +1,7 @@ # less initialization script (sh) [ -x /usr/bin/lesspipe.sh ] && export LESSOPEN="|/usr/bin/lesspipe.sh %s" + +if [ x`echo $LANG | cut -b 1-2` = x"ja" ]; then + export JLESSCHARSET=japanese; +fi + diff --git a/less.spec b/less.spec index a0ef619..34ebc6b 100644 --- a/less.spec +++ b/less.spec @@ -1,22 +1,20 @@ -%define enable_japanese 1 - Summary: A text file browser similar to more, but better. Name: less Version: 358 -Release: 7j1 +Release: 16 License: GPL Group: Applications/Text Source: http://www.flash.net/~marknu/less/%{name}-%{version}.tar.gz Source1: lesspipe.sh Source2: less.sh Source3: less.csh -Patch: less-shell.patch +Patch0: less-shell.patch +Patch1: less-edit.patch # Japanese patch -# http://home.jp.FreeBSD.org/~kuriyama/less-358+iso247-20000803.diff.gz -Patch10: less-358+iso247-20000803.diff - +Patch2: less-358+iso247-20001210.diff +Patch3: less-358-latin1.patch URL: http://www.flash.net/~marknu/less/ -Buildroot: /var/tmp/less-root +Buildroot: %{_tmppath}/%{name}-root %description The less utility is a text file browser that resembles more, but has @@ -31,10 +29,8 @@ files, and you'll use it frequently. %prep %setup -q %patch -p1 -b .bug -%if %{enable_japanese} -cd $RPM_BUILD_DIR/less-358/ -%patch10 -b .i18n -%endif +%patch2 -p1 -b .i18n +%patch3 -p1 -b .lat1 %build %configure @@ -59,8 +55,36 @@ install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog -* Tue Aug 29 2000 Yukihiro Nakai -- Add Japanese patch +* Mon Feb 5 2001 Yukihiro Nakai +- Update less.sh, less.csh to set JLESSCHARSET=japanese + when LANG=ja?? + +* Mon Feb 5 2001 Matt Wilson +- changed the less-358+iso247-20001210.diff patch to use strcasecmp when + comparing locale names + +* Thu Feb 01 2001 Karsten Hopp +- fixed character translations (bugzilla #24463) + +* Wed Jan 31 2001 Karsten Hopp +- fixed lesspipe (bugzilla #17456 #25324) + +* Tue Dec 12 2000 Bernhard Rosenkraenzer +- rebuild with new ncurses + +* Mon Dec 11 2000 Yukihiro Nakai +- Add Japanese patch with ia64 support. + +* Mon Nov 27 2000 Karsten Hopp +- rebuild with new ncurses +- fix Bug #21288 + +* Mon Nov 13 2000 Karsten Hopp +- fixed handling of manpages of type *.1x.gz +- added support for cpio packages + +* Thu Sep 14 2000 Than Ngo +- added new lesspipe.sh (Bug #17456) * Wed Aug 23 2000 Bernhard Rosenkraenzer - support files with spaces in their names (Bug #16777) diff --git a/lesspipe.sh b/lesspipe.sh index 5dda022..481c4bd 100755 --- a/lesspipe.sh +++ b/lesspipe.sh @@ -1,37 +1,34 @@ -#!/bin/sh +#!/bin/sh - # # To use this filter with less, define LESSOPEN: # export LESSOPEN="|/usr/bin/lesspipe.sh %s" lesspipe() { case "$1" in - *.1.gz|*.2.gz|*.3.gz|*.4.gz|*.5.gz|*.7.gz|*.8.gz|*.9.gz|*.n.gz|*.man.gz) - if gunzip -c "$1" |file - |grep troff &>/dev/null; then - gunzip -c "$1" |groff -s -p -t -e -Tlatin1 -mandoc - - fi ;; - *.1.bz2|*.2.bz2|*.3.bz2|*.4.bz2|*.5.bz2|*.7.bz2|*.8.bz2|*.9.bz2|*.n.bz2|*.man.bz2) - if bunzip2 -c "$1" |file - |grep troff &>/dev/null; then - bunzip2 -c "$1" |groff -s -p -t -e -Tlatin1 -mandoc - - fi ;; - *.tar) tar tvvf "$1" 2>/dev/null ;; # View contents of .tar and .tgz files - *.tgz) tar tzvvf "$1" 2>/dev/null ;; - *.tar.gz) tar tzvvf "$1" 2>/dev/null ;; - *.tar.bz2) bzip2 -dc "$1" | tar tvvf - 2>/dev/null ;; - *.tar.Z) tar tzvvf "$1" 2>/dev/null ;; - *.tar.z) tar tzvvf "$1" 2>/dev/null ;; - *.Z) gzip -dc "$1" 2>/dev/null ;; # View compressed files correctly - *.z) gzip -dc "$1" 2>/dev/null ;; - *.gz) gzip -dc "$1" 2>/dev/null ;; - *.bz2) bzip2 -dc "$1" 2>/dev/null ;; - *.zip) unzip -l "$1" 2>/dev/null ;; - *.rpm) rpm -qpivl "$1" 2>/dev/null ;; # view contents of .rpm files - *.1|*.2|*.3|*.4|*.5|*.6|*.7|*.8|*.9|*.n|*.man) FILE=`file -L "$1"` ; # groff src - FILE=`echo "$FILE" | cut -d ' ' -f 2` - if [ "$FILE" = "troff" ]; then - groff -s -p -t -e -Tascii -mandoc "$1" - fi ;; + *.[1-9n]|*.man|*.[1-9n].bz2|*.man.bz2|*.[1-9].gz|*.[1-9]x.gz|*.[1-9].man.gz) + case "$1" in + *.gz) DECOMPRESSOR="gunzip -c" ;; + *.bz2) DECOMPRESSOR="bunzip2 -c" ;; + *) DECOMPRESSOR="cat" ;; + esac + if $DECOMPRESSOR -- "$1" | file - | grep -q troff; then + if echo "$1" | grep -q ^/; then #absolute path + man -- "$1" | cat -s + else + man -- "./$1" | cat -s + fi + else + $DECOMPRESSOR -- "$1" + fi ;; + *.tar) tar tvvf "$1" ;; + *.tgz|*.tar.gz|*.tar.[zZ]) tar tzvvf "$1" ;; + *.tar.bz2|*.tbz2) tar tIvvf "$1" ;; + *.[zZ]|*.gz) gzip -dc -- "$1" ;; + *.bz2) bzip2 -dc -- "$1" ;; + *.zip) zipinfo -- "$1" ;; + *.rpm) rpm -qpivl -- "$1" ;; + *.cpi|*.cpio) cpio -itv < "$1" ;; esac } -lesspipe "$1" - +lesspipe "$1" 2> /dev/null