From b3e34b862d6c5095d6220d24a680a47b1ee9844f Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Mon, 14 Dec 2009 09:05:26 +0000 Subject: [PATCH] Resolves: #546613 - RFE: add *.jar *.nbm to lesspipe.sh Resolves: #537746 - Two different descriptions about the default value of LESSBINFMT --- less-436-manpage.patch | 18 ++++++++++++++++++ less.spec | 10 +++++++++- lesspipe.sh | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 less-436-manpage.patch diff --git a/less-436-manpage.patch b/less-436-manpage.patch new file mode 100644 index 0000000..181ee4a --- /dev/null +++ b/less-436-manpage.patch @@ -0,0 +1,18 @@ +diff -up less-436/less.man.manpage less-436/less.man +--- less-436/less.man.manpage 2009-07-08 00:27:22.000000000 +0200 ++++ less-436/less.man 2009-12-09 17:48:54.571351651 +0100 +@@ -1164,10 +1164,10 @@ LESS(1) + attribute is assumed. The remainder of LESSBINFMT is a string which + may include one printf-style escape sequence (a % followed by x, X, o, + d, etc.). For example, if LESSBINFMT is "*u[%x]", binary characters +- are displayed in underlined hexadecimal surrounded by brackets. The +- default if no LESSBINFMT is specified is "*s<%X>". The default if no +- LESSBINFMT is specified is "*s<%02X>". Warning: the result of expand- +- ing the character via LESSBINFMT must be less than 31 characters. ++ are displayed in underlined hexadecimal surrounded by brackets. The ++ default if no LESSBINFMT is specified is "*s<%02X>". Warning: the ++ result of expanding the character via LESSBINFMT must be less than 31 ++ characters. + + When the character set is utf-8, the LESSUTFBINFMT environment variable + acts similarly to LESSBINFMT but it applies to Unicode code points that diff --git a/less.spec b/less.spec index 763d334..9cdd578 100644 --- a/less.spec +++ b/less.spec @@ -1,7 +1,7 @@ Summary: A text file browser similar to more, but better Name: less Version: 436 -Release: 2%{?dist} +Release: 4%{?dist} License: GPLv3+ Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Source3: less.csh Patch1: less-406-Foption.patch Patch4: less-394-time.patch Patch5: less-418-fsync.patch +Patch6: less-436-manpage.patch URL: http://www.greenwoodsoftware.com/less/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -32,6 +33,7 @@ files, and you'll use it frequently. %patch1 -p1 -b .Foption %patch4 -p1 -b .time %patch5 -p1 -b .fsync +%patch6 -p1 -b .manpage autoreconf @@ -63,6 +65,12 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 12 2009 Nikola Pajkovsky - 436-4 +- #546613 - RFE: add *.jar *.nbm to lesspipe.sh + +* Wed Dec 9 2009 Nikola Pajkovsky - 436-3 +- Resolves: #537746 - Two different descriptions about the default value of LESSBINFMT + * Fri Jul 24 2009 Fedora Release Engineering - 436-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/lesspipe.sh b/lesspipe.sh index e9f7dec..5791539 100755 --- a/lesspipe.sh +++ b/lesspipe.sh @@ -26,7 +26,7 @@ lesspipe() { *.[zZ]|*.gz) gzip -dc -- "$1" ;; *.bz2) bzip2 -dc -- "$1" ;; *.lzma) lzma -c -d -- "$1" ;; - *.zip) zipinfo -- "$1" ;; + *.zip|*.jar|*.nbm) zipinfo -- "$1" ;; *.rpm) rpm -qpivl --changelog -- "$1" ;; *.cpi|*.cpio) cpio -itv < "$1" ;; *.gif|*.jpeg|*.jpg|*.pcd|*.png|*.tga|*.tiff|*.tif)