From a557a1b3867adb9268905170196d05f6e5601508 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:14:59 +0000 Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20less-37?= =?UTF-8?q?8-7.src.rpm=20Tue=20Feb=2004=202003=20Tim=20Waugh=20=20378-7=20-=20Part=20of=20multibyte=20patch=20was=20mi?= =?UTF-8?q?ssing;=20fixed.=20Mon=20Feb=2003=202003=20Tim=20Waugh=20=20378-6=20-=20Fix=20underlining=20multibyte=20char?= =?UTF-8?q?acters=20(bug=20#83377).=20Thu=20Jan=2030=202003=20Karsten=20Ho?= =?UTF-8?q?pp=20=20378-5=20-=20removed=20older,=20unuse?= =?UTF-8?q?d=20patches=20-=20add=20patch=20from=20Yukihiro=20Nakai=20to=20?= =?UTF-8?q?fix=20display=20of=20japanese=20text=20(#79977)=20Wed=20Jan=202?= =?UTF-8?q?2=202003=20Tim=20Powers=20=20-=20rebuilt=20Wed?= =?UTF-8?q?=20Dec=2018=202002=20Karsten=20Hopp=20=C4=8D?= =?UTF-8?q?=20-=20removed=20default=20'cat'=20from=20lesspipe.sh=20as=20it?= =?UTF-8?q?=20breaks=20'v'=20and=20'F'=20keys=20=20=20=20=20(#79921)=20Fri?= =?UTF-8?q?=20Dec=2006=202002=20Nalin=20Dahyabhai=20=203?= =?UTF-8?q?78-2=20-=20add=20a=20default=20case=20to=20lesspipe=20so=20that?= =?UTF-8?q?=20it=20shows=20other=20kinds=20of=20files=20Mon=20Nov=2004=202?= =?UTF-8?q?002=20Karsten=20Hopp=20=20-=20less-378=20-?= =?UTF-8?q?=20added=20some=20debian=20patches=20-=20show=20image=20info=20?= =?UTF-8?q?instead=20of=20binary=20garbage=20when=20viewing=20images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- less.spec | 69 +++++++++++++++++++++++++---------------------------- lesspipe.sh | 13 ++++++++++ sources | 2 +- 4 files changed, 47 insertions(+), 39 deletions(-) diff --git a/.cvsignore b/.cvsignore index eb93d96..2723c87 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -less-358.tar.gz +less-378.tar.gz diff --git a/less.spec b/less.spec index 339195e..117377b 100644 --- a/less.spec +++ b/less.spec @@ -1,24 +1,19 @@ Summary: A text file browser similar to more, but better. Name: less -Version: 358 -Release: 28 +Version: 378 +Release: 7 License: GPL Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz Source1: lesspipe.sh Source2: less.sh Source3: less.csh -Patch0: less-shell.patch -Patch1: less-edit.patch -# Japanese patch -Patch2: less-358-iso254.patch -Patch3: less-358-eline.patch -# Patch to fix things which the Japanese patch broke: -Patch4: less-358-charset.patch -Patch5: less-358-rh.patch -# One more patch for the broken i18n patch -Patch6: less-number.patch -Patch7: less-358-mf.patch + +# Patches for less-378 +Patch0: less-378-rh1.patch +Patch1: less-378+iso247-20030108.diff +Patch2: less-378-multibyte.patch + URL: http://www.greenwoodsoftware.com/less/ Buildroot: %{_tmppath}/%{name}-root BuildRequires: ncurses-devel @@ -35,13 +30,10 @@ files, and you'll use it frequently. %prep %setup -q -%patch -p1 -b .bug -%patch2 -p1 -b .i18n -#%patch3 -p1 -b .eline -%patch4 -p1 -b .chset -#%patch5 -p1 -b .rh -#%patch6 -p1 -b .num -%patch7 -p1 -b .mf +%patch0 -p1 -b .rh1 +%patch1 -p1 -b .jp +%patch2 -p1 -b .multibyte +chmod -R a+w * %build %configure @@ -66,28 +58,31 @@ install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog -* Fri Jun 21 2002 Tim Powers -- automated rebuild +* Tue Feb 4 2003 Tim Waugh 378-7 +- Part of multibyte patch was missing; fixed. -* Tue Jun 18 2002 Karsten Hopp 358-27 -- added Kazushi (Jam) Marukawa ISO-2022 patch 254 to support multibyte - characters -- added Mike Fabians patch to fix bold/underlined non-ASCII - characters in UTF-8 mode -- finally added support for directories (#17456 and #62050) -- re-enabled fallback if no charset could be found (#24463) -- added Matt's fix for #26113 -- show changelog and filelist when viewing a rpm package (#64900) +* Mon Feb 3 2003 Tim Waugh 378-6 +- Fix underlining multibyte characters (bug #83377). +* Thu Jan 30 2003 Karsten Hopp 378-5 +- removed older, unused patches +- add patch from Yukihiro Nakai to fix display of japanese text + (#79977) -* Thu May 23 2002 Tim Powers -- automated rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu Apr 25 2002 Than Ngo 358-25 -- add fix to handle tar.bz2 file +* Wed Dec 18 2002 Karsten Hopp č +- removed default 'cat' from lesspipe.sh as it breaks 'v' and 'F' keys + (#79921) -* Wed Jan 09 2002 Tim Powers -- automated rebuild +* Fri Dec 6 2002 Nalin Dahyabhai 378-2 +- add a default case to lesspipe so that it shows other kinds of files + +* Mon Nov 04 2002 Karsten Hopp +- less-378 +- added some debian patches +- show image info instead of binary garbage when viewing images * Fri Oct 05 2001 Karsten Hopp - fix line numbering (less -N filename), caused by diff --git a/lesspipe.sh b/lesspipe.sh index 5a71d6f..2a558ab 100755 --- a/lesspipe.sh +++ b/lesspipe.sh @@ -28,6 +28,19 @@ lesspipe() { *.zip) zipinfo -- "$1" ;; *.rpm) rpm -qpivl --changelog -- "$1" ;; *.cpi|*.cpio) cpio -itv < "$1" ;; + *.gif|*.jpeg|*.jpg|*.pcd|*.png|*.tga|*.tiff|*.tif) + if [ -x "`which identify`" ]; then + identify "$1" + else + echo "No identify available" + echo "Install ImageMagick to browse images" + fi ;; + *) + case "$1" in + *.gz) DECOMPRESSOR="gunzip -c" ;; + *.bz2) DECOMPRESSOR="bunzip2 -c" ;; + esac + $DECOMPRESSOR -- "$1" ;; esac } diff --git a/sources b/sources index b7b9cc2..077371d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -692a94060a50dd35a4d65176cb899444 less-358.tar.gz +db73e39a2d1a68eafa949f80be5a28c8 less-378.tar.gz