From f2dc55a0a952ee89f66ea4f1cbc38e85ba2f4f73 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 07:15:22 +0000
Subject: [PATCH] auto-import changelog data from less-378-11.1.src.rpm Mon Sep
 01 2003 Karsten Hopp <karsten@redhat.de> 378-11.1 - rebuilt Mon Sep 01 2003
 Karsten Hopp <karsten@redhat.de> 378-11 - use LC_ALL when set (lang.[c]sh)
 Mon Aug 11 2003 Karsten Hopp <karsten@redhat.de> 378-10.1 - link against
 ncursesw if available Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> -
 rebuilt Wed May 28 2003 Florian La Roche <Florian.LaRoche@redhat.de> - fix
 korean #79977 - add new less.sh from #89780, s/ko/korean/ and write .csh
 script - add patch from #91661: /japanses/japanese-euc/

---
 less.csh  | 19 +++++++++++++------
 less.sh   | 13 +++++++++----
 less.spec | 24 +++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/less.csh b/less.csh
index 95b6874..6d7ac6c 100755
--- a/less.csh
+++ b/less.csh
@@ -3,10 +3,17 @@ 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
-  else if ( `echo $LANG | cut -b 1-2` == "ko" ) then
-    setenv JLESSCHARSET ko
-  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
+    setenv JLESSCHARSET japanese-euc
+  else 
+    if ( `echo $LANGVAR | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` == "EUCKR" ) then
+       setenv JLESSCHARSET korean
+    endif
+  endif
diff --git a/less.sh b/less.sh
index 9af1c34..9dba84c 100755
--- a/less.sh
+++ b/less.sh
@@ -1,9 +1,14 @@
 # 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;
-elif [ x`echo $LANG | cut -b 1-2` = x"ko" ]; then
-	export JLESSCHARSET=ko;
+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
+        export JLESSCHARSET=japanese-euc
+elif [ x`echo $LANGVAR | cut -b 7- | tr -s "[:lower:]" "[:upper:]"` = x"EUCKR" ]; then
+        export JLESSCHARSET=korean
+fi
diff --git a/less.spec b/less.spec
index 117377b..4f5627d 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: 7
+Release: 11.1
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -13,6 +13,8 @@ Source3: less.csh
 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
 
 URL: http://www.greenwoodsoftware.com/less/
 Buildroot: %{_tmppath}/%{name}-root
@@ -33,9 +35,12 @@ files, and you'll use it frequently.
 %patch0 -p1 -b .rh1
 %patch1 -p1 -b .jp
 %patch2 -p1 -b .multibyte
+%patch3 -p1
+%patch4 -p1 -b .ncursesw
 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}
 
@@ -58,6 +63,23 @@ install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 01 2003 Karsten Hopp <karsten@redhat.de> 378-11.1
+- rebuilt
+
+* Mon Sep 01 2003 Karsten Hopp <karsten@redhat.de> 378-11
+- use LC_ALL when set (lang.[c]sh)
+
+* Mon Aug 11 2003 Karsten Hopp <karsten@redhat.de> 378-10.1
+- link against ncursesw if available
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed May 28 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- fix korean #79977
+- add new less.sh from #89780, s/ko/korean/ and write .csh script
+- add patch from #91661: /japanses/japanese-euc/
+
 * Tue Feb  4 2003 Tim Waugh <twaugh@redhat.com> 378-7
 - Part of multibyte patch was missing; fixed.