Fixed licensing and displaying of nonascii characters #1257516 #1241543

less.csh

@@ -1,4 +1,9 @@
+#!/bin/csh
 # less initialization script (csh)
 if ( -x /usr/bin/lesspipe.sh ) then
-  setenv LESSOPEN "||/usr/bin/lesspipe.sh %s"
+    if ( $?LESSOPEN && { eval 'test ! -z "$LESSOPEN"' } ) then
+        :
+    else  
+        setenv LESSOPEN "|/usr/bin/lesspipe.sh %s"
+    endif
 endif

less.sh

@@ -1,2 +1,4 @@
 # less initialization script (sh)
-[ -x /usr/bin/lesspipe.sh ] && export LESSOPEN="${LESSOPEN-||/usr/bin/lesspipe.sh %s}"
+if [ -x /usr/bin/lesspipe.sh ] && [ -z "$LESSOPEN" ]; then
+    export LESSOPEN="|/usr/bin/lesspipe.sh %s"
+fi

less.spec

@@ -21,6 +21,7 @@ Patch11: less-458-old-bot-in-help.patch
 Patch12: less-471-out_of_bounds_read.patch
 URL: http://www.greenwoodsoftware.com/less/
 Requires: groff-base
+Requires: man-db
 BuildRequires: ncurses-devel
 BuildRequires: autoconf automake libtool
 
@@ -62,8 +63,8 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 
 %files
-%doc README NEWS INSTALL COPYING
-%license LICENSE
+%doc README NEWS INSTALL
+%license LICENSE COPYING
 /etc/profile.d/*
 %{_bindir}/*
 %{_mandir}/man1/*
@@ -72,6 +73,8 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 * Mon Aug 03 2015 Viktor Jancik <vjancik@redhat.com> - 471-5
 - Updated spec file to comply with current Fedora Packaging Guidelines
   Added missing documentation files
+- Corrected license information #1257516
+- Fixed preprocessing of man pages with special characters #1241543
 
 * Mon Jun 01 2015 Jozef Mlich <jmlich@redhat.com> - 471-4
 - update of previous patch

lesspipe.sh

@@ -30,6 +30,8 @@ if [ -x ~/.lessfilter ]; then
 	fi
 fi
 
+export MAN_KEEP_FORMATTING=1
+
 case "$1" in
 *.[1-9n].bz2|*.[1-9]x.bz2|*.man.bz2|*.[1-9n].[gx]z|*.[1-9]x.[gx]z|*.man.[gx]z|*.[1-9n].lzma|*.[1-9]x.lzma|*.man.lzma)
 	case "$1" in
@@ -38,12 +40,12 @@ case "$1" in
 	*.xz|*.lzma)	DECOMPRESSOR="xz -dc" ;;
 	esac
 	if [ -n "$DECOMPRESSOR" ] && $DECOMPRESSOR -- "$1" | file - | grep -q troff; then
-		$DECOMPRESSOR -- "$1" | groff -Tascii -mandoc -
+		$DECOMPRESSOR -- "$1" | man -P cat -l -
 		exit $?
 	fi ;;&
 *.[1-9n]|*.[1-9]x|*.man)
 	if file "$1" | grep -q troff; then
-		groff -Tascii -mandoc "$1" | cat -s
+		man -P cat -l "$1"
 		exit $?
 	fi ;;&
 *.tar) tar tvvf "$1"; exit $? ;;