[packages/lesspipe] highlight 3.0 beta+ support -disabled separate output format options (use --out-format instead)

[gotar]

commit de67b3500df4a0a90c78222d8ff110ef43bfc525
Author: Tomasz Pala <gotar at pld-linux.org>
Date:   Wed Aug 23 22:09:27 2017 +0200

    highlight 3.0 beta+ support
    -disabled separate output format options (use --out-format instead)

 lesspipe.sh   | 2 +-
 lesspipe.spec | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/lesspipe.spec b/lesspipe.spec
index 66dc607..f416873 100644
--- a/lesspipe.spec
+++ b/lesspipe.spec
@@ -6,17 +6,18 @@ Summary:	Input preprocessor for less
 Summary(pl.UTF-8):	Preprocesor wejścia dla narzędzia less
 Name:		lesspipe
 Version:	1.57
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/Text
 Source0:	%{name}.sh
 BuildRequires:	rpmbuild(macros) >= 1.316
 Suggests:	file
 Suggests:	gnupg
-Suggests:	highlight
+Suggests:	highlight >= 3.0
 Suggests:	mailcap >= 2.3
 Suggests:	objdump
 Suggests:	openssl-tools
+Conflicts:	highlight < 3.0
 Conflicts:	less < 394-7.1
 Conflicts:	tar < 1:1.22
 BuildArch:	noarch
diff --git a/lesspipe.sh b/lesspipe.sh
index d7c89ca..dbf5658 100755
--- a/lesspipe.sh
+++ b/lesspipe.sh
@@ -149,7 +149,7 @@ lesspipe() {
 			output=ansi;;
 		esac
 		run-mailcap "$1" || {
-			echo "$LESS" | grep -qi r || ps -p $PPID,$(ps -p $PPID -oppid=) -oargs= | grep -qiw -- -r && highlight --$output --style=darkblue "$1";
+			echo "$LESS" | grep -qi r || ps -p $PPID,$(ps -p $PPID -oppid=) -oargs= | grep -qiw -- -r && highlight --out-format=$output --style=darkblue "$1";
 		}
 	# Check to see if binary, if so -- view with 'strings'
 	# FILE=$(file -L "$1")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lesspipe.git/commitdiff/de67b3500df4a0a90c78222d8ff110ef43bfc525