diff --git a/.cvsignore b/.cvsignore index 2723c87..53c8ea7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -less-378.tar.gz +less-381.tar.gz diff --git a/less.csh b/less.csh index 6d7ac6c..529a138 100755 --- a/less.csh +++ b/less.csh @@ -3,17 +3,10 @@ if ( -x /usr/bin/lesspipe.sh ) then setenv LESSOPEN "|/usr/bin/lesspipe.sh %s" endif -if ( $?LC_ALL ) then - setenv LANGVAR $LC_ALL -else - setenv LANGVAR $LANG -endif - - -if ( `echo $LANGVAR | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` == "EUCJP" ) then +if ( $?LANG ) then + if ( `echo $LANG | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` == "EUCJP" ) then setenv JLESSCHARSET japanese-euc - else - if ( `echo $LANGVAR | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` == "EUCKR" ) then - setenv JLESSCHARSET korean - endif + else if ( `echo $LANG | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` == "EUCKR" ) then + setenv JLESSCHARSET korean endif +endif diff --git a/less.sh b/less.sh index 9dba84c..5d1b443 100755 --- a/less.sh +++ b/less.sh @@ -1,14 +1,8 @@ # less initialization script (sh) [ -x /usr/bin/lesspipe.sh ] && export LESSOPEN="|/usr/bin/lesspipe.sh %s" -if [ x"$LC_ALL" != "x" ]; then - LANGVAR=$LC_ALL -else - LANGVAR=$LANG -fi - -if [ x`echo $LANGVAR | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` = x"EUCJP" ]; then +if [ x`echo $LANG | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` = x"EUCJP" ]; then export JLESSCHARSET=japanese-euc -elif [ x`echo $LANGVAR | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` = x"EUCKR" ]; then +elif [ x`echo $LANG | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` = x"EUCKR" ]; then export JLESSCHARSET=korean fi diff --git a/less.spec b/less.spec index 4f5627d..37ca2b7 100644 --- a/less.spec +++ b/less.spec @@ -1,7 +1,7 @@ Summary: A text file browser similar to more, but better. Name: less -Version: 378 -Release: 11.1 +Version: 381 +Release: 2 License: GPL Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz @@ -10,11 +10,7 @@ Source2: less.sh Source3: less.csh # Patches for less-378 -Patch0: less-378-rh1.patch -Patch1: less-378+iso247-20030108.diff -Patch2: less-378-multibyte.patch -Patch3: less-378-ko.patch -Patch4: less-378-ncursesw.patch +Patch0: less-381+iso247-20030611.diff URL: http://www.greenwoodsoftware.com/less/ Buildroot: %{_tmppath}/%{name}-root @@ -32,15 +28,10 @@ files, and you'll use it frequently. %prep %setup -q -%patch0 -p1 -b .rh1 -%patch1 -p1 -b .jp -%patch2 -p1 -b .multibyte -%patch3 -p1 -%patch4 -p1 -b .ncursesw +#%patch0 -p1 -b .iso247 chmod -R a+w * %build -autoconf %configure make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" datadir=%{_docdir} @@ -63,14 +54,11 @@ install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog -* Mon Sep 01 2003 Karsten Hopp 378-11.1 -- rebuilt +* Thu Jan 15 2004 Karsten Hopp 381-2 +- drop iso247 patch, doesn't work -* Mon Sep 01 2003 Karsten Hopp 378-11 -- use LC_ALL when set (lang.[c]sh) - -* Mon Aug 11 2003 Karsten Hopp 378-10.1 -- link against ncursesw if available +* Wed Jun 11 2003 Karsten Hopp 381-1 +- new version with rewritten iso247 patch * Wed Jun 04 2003 Elliot Lee - rebuilt diff --git a/sources b/sources index 077371d..316472c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db73e39a2d1a68eafa949f80be5a28c8 less-378.tar.gz +40c2dd4ac137b61b6a55a6478817daf4 less-381.tar.gz