Merge branch 'rawhide' into f41

.gitignore

@@ -12,5 +12,3 @@
 /less-668.tar.gz
 /less-678.tar.gz
 /less-679.tar.gz
-/less-685.tar.gz
-/lesspipe-2.20.tar.gz

less-458-less-filters-man.patch

@@ -20,5 +20,5 @@ diff -up less-466/less.nro.filters-man less-466/less.nro
 +~/.lessfilter tries to handle the file.
 +
  .SH "NATIONAL CHARACTER SETS"
- There are five types of characters in the input file:
+ There are three types of characters in the input file:
  .IP "normal characters"

less.spec

@@ -1,11 +1,10 @@
 Summary: A text file browser similar to more, but better
 Name: less
-Version: 685
-Release: 6%{?dist}
+Version: 679
+Release: 1%{?dist}
 License: GPL-3.0-only and BSD-2-Clause
 Source0: https://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
-%global lesspipe_version 2.20
-Source1: https://github.com/wofr06/lesspipe/archive/refs/tags/v%{lesspipe_version}.tar.gz#/lesspipe-%{lesspipe_version}.tar.gz
+Source1: lesspipe.sh
 Source2: less.sh
 Source3: less.csh
 Patch4: less-394-time.patch
@@ -20,13 +19,6 @@ URL: https://www.greenwoodsoftware.com/less/
 BuildRequires: ncurses-devel
 BuildRequires: autoconf automake libtool
 BuildRequires: make
-# for lesspipe make test
-BuildRequires: perl-Archive-Tar
-# for lesspipe
-Recommends: (less-color = %{version}-%{release} if perl-interpreter)
-Recommends: unzip
-Recommends: html2text
-Recommends: 7zip
 
 %description
 The less utility is a text file browser that resembles more, but has
@@ -38,17 +30,8 @@ example, vi).
 You should install less because it is a basic utility for viewing text
 files, and you'll use it frequently.
 
-%package color
-Summary: Colorizers for less
-Requires: %{name} = %{version}-%{release}
-Conflicts: less < 685-5
-
-%description color
-Syntax highlighting modes for the less pager.
-
-
 %prep
-%setup -q -a 1
+%setup -q
 %patch -P 4 -p1 -b .time
 %patch -P 5 -p2 -b .fsync
 %patch -P 6 -p1 -b .manpage-add-old-bot-option
@@ -65,69 +48,21 @@ autoreconf -fiv
 %configure
 %make_build CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 
-pushd lesspipe-%{lesspipe_version}
-#fix shebangs
-sed -i "s|^#!/usr/bin/env bash|^#!/usr/bin/bash|" lesspipe.sh
-
-./configure --prefix=%{_prefix}
-%make_build
-popd
-
 %install
 %make_install
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
+install -p        %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 
-pushd lesspipe-%{lesspipe_version}
-%make_install
-rm -f $RPM_BUILD_ROOT/usr/share/bash-completion/less_completion
-popd
-
-%check
-pushd lesspipe-%{lesspipe_version}
-# we dont have all required components to pass full test, but it is still
-# useful to run for debug purposes
-make test ||:
-popd
-
 %files
 %doc README NEWS INSTALL
 %license LICENSE COPYING
 /etc/profile.d/*
-%{_bindir}/less
-%{_bindir}/lesscomplete
-%{_bindir}/lessecho
-%{_bindir}/lesskey
-%{_bindir}/lesspipe.sh
+%{_bindir}/*
 %{_mandir}/man1/*
 
-%files color
-%{_bindir}/archive_color
-%{_bindir}/code2color
-%{_bindir}/sxw2txt
-%{_bindir}/vimcolor
-
 %changelog
-* Mon Nov 24 2025 Michal Hlavinka <mhlavink@redhat.com> - 685-6
-- reintroduce use more feature rich lesspipe filter, but separate
-  perl dependent colorizer into subpackage, credits Yaakov Selkowitz 
-
-* Fri Nov 14 2025 Adam Williamson <awilliam@redhat.com> - 685-5
-- Revert new lesspipe filter due to hard perl dependency
-
-* Wed Nov 12 2025 Michal Hlavinka <mhlavink@redhat.com> - 685-4
-- use more feature rich lesspipe filter (#2308285)
-
-* Wed Oct 22 2025 Michal Hlavinka <mhlavink@redhat.com> - 685-1
-- updated to 685 (#2404089)
-
-* Tue Sep 02 2025 Michal Hlavinka <mhlavink@redhat.com> - 679-4
-- add man page for lesspipe.sh (rhbz#2376159)
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 679-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
 * Mon Jun 23 2025 Michal Hlavinka <mhlavink@redhat.com> - 679-1
 - updated to 679
 

lesspipe.sh

@@ -0,0 +1,132 @@
+#!/bin/sh
+#
+# To use this filter with less, define LESSOPEN:
+# export LESSOPEN="|/usr/bin/lesspipe.sh %s"
+#
+# The script should return zero if the output was valid and non-zero
+# otherwise, so less could detect even a valid empty output
+# (for example while uncompressing gzipped empty file).
+# For backward-compatibility, this is not required by default. To turn
+# this functionality there should be another vertical bar (|) straight
+# after the first one in the LESSOPEN environment variable:
+# export LESSOPEN="||/usr/bin/lesspipe.sh %s"
+
+if [ ! -e "$1" ] ; then
+	exit 1
+fi
+
+if [ -d "$1" ] ; then
+	ls -alF -- "$1"
+	exit $?
+fi
+
+exec 2>/dev/null
+
+# Allow for user defined filters
+if [ -x ~/.lessfilter ]; then
+	~/.lessfilter "$1"
+	if [ $? -eq 0 ]; then
+		exit 0
+	fi
+fi
+
+manfilter ()
+{
+	if test -x /usr/bin/man ; then
+		# See rhbz#1241543 for more info.  Well, actually we firstly
+		# used 'man -l', then we switched to groff, and then we again
+		# switched back to 'man -l'.
+		/usr/bin/man -P /usr/bin/cat -l "$1"
+	elif test -x /usr/bin/groff; then
+		# This is from pre-rhbz#1241543-time.
+		groff -Tascii -mandoc "$1" | cat -s
+	else
+		echo "WARNING:"
+		echo "WARNING: to better show manual pages, install 'man-db' package"
+		echo "WARNING:"
+		cat "$1"
+	fi
+}
+
+export MAN_KEEP_FORMATTING=1
+
+case "$1" in
+*.[1-9n].bz2|*.[1-9]x.bz2|*.man.bz2|*.[1-9n].[glx]z|*.[1-9]x.[glx]z|*.man.[glx]z|*.[1-9n].lzma|*.[1-9]x.lzma|*.man.lzma|*.[1-9n].zst|*.[1-9]x.zst|*.man.zst|*.[1-9n].br|*.[1-9]x.br|*.man.br)
+	case "$1" in
+	*.gz)		DECOMPRESSOR="gzip -dc" ;;
+	*.bz2)		DECOMPRESSOR="bzip2 -dc" ;;
+	*.lz)		DECOMPRESSOR="lzip -dc" ;;
+	*.zst)		DECOMPRESSOR="zstd -dcq" ;;
+	*.br)		DECOMPRESSOR="brotli -dc" ;;
+	*.xz|*.lzma)	DECOMPRESSOR="xz -dc" ;;
+	esac
+	if [ -n "$DECOMPRESSOR" ] && $DECOMPRESSOR -- "$1" | file - | grep -q troff; then
+		$DECOMPRESSOR -- "$1" | manfilter -
+		exit $?
+	fi
+esac
+case "$1" in
+*.[1-9n]|*.[1-9]x|*.man)
+	if file "$1" | grep -q troff; then
+		manfilter "$1"
+		exit $?
+	fi
+esac
+case "$1" in
+*.tar) tar tvvf "$1"; exit $? ;;
+*.tgz|*.tar.gz|*.tar.[zZ]) tar tzvvf "$1"; exit $? ;;
+*.tar.xz) tar Jtvvf "$1"; exit $? ;;
+*.xz|*.lzma) xz -dc -- "$1"; exit $? ;;
+*.tar.lz) tar --lzip -tvvf "$1"; exit $? ;;
+*.lz) lzip -dc -- "$1"; exit $? ;;
+*.tar.zst) tar --zstd -tvvf "$1"; exit $? ;;
+*.zst) zstd -dcq -- "$1"; exit $? ;;
+*.tar.br) brotli -dc -- "$1" | tar tvvf -; exit $? ;;
+*.br) brotli -dc -- "$1"; exit $? ;;
+*.tar.bz2|*.tbz2) bzip2 -dc -- "$1" | tar tvvf -; exit $? ;;
+*.[zZ]|*.gz) gzip -dc -- "$1"; exit $? ;;
+*.bz2) bzip2 -dc -- "$1"; exit $? ;;
+*.zip|*.jar|*.nbm) zipinfo -- "$1"; exit $? ;;
+# --nomanifest -> rhbz#1450277
+*.rpm) rpm -qpivl --changelog --nomanifest -- "$1"; exit $? ;;
+*.cpi|*.cpio) cpio -itv < "$1"; exit $? ;;
+*.gpg)
+	if [ -x /usr/bin/gpg2 ]; then
+		gpg2 -d "$1"
+		exit $?
+	elif [ -x /usr/bin/gpg ]; then
+		gpg -d "$1"
+		exit $?
+	else
+		echo "No GnuPG available."
+		echo "Install gnupg2 or gnupg to show encrypted files."
+		exit 1
+	fi ;;
+*.gif|*.jpeg|*.jpg|*.pcd|*.png|*.tga|*.tiff|*.tif)
+	if [ -x /usr/bin/identify ]; then
+		identify "$1"
+		exit $?
+	elif [ -x /usr/bin/gm ]; then
+		gm identify "$1"
+		exit $?
+	else
+		echo "No identify available"
+		echo "Install ImageMagick or GraphicsMagick to browse images"
+		exit 1
+	fi ;;
+*)
+	if [ -x /usr/bin/file ] && [ -x /usr/bin/iconv ] && [ -x /usr/bin/cut ]; then
+		case `file -b "$1"` in
+		*UTF-16*) conv='UTF-16' ;;
+		*UTF-32*) conv='UTF-32' ;;
+		esac
+		if [ -n "$conv" ]; then
+			env=`echo $LANG | cut -d. -f2`
+			if [ -n "$env" -a "$conv" != "$env" ]; then
+				iconv -f $conv -t $env "$1"
+				exit $?
+			fi
+		fi
+	fi
+	exit 1
+esac

sources

@@ -1,2 +1 @@
-SHA512 (less-685.tar.gz) = aff745f1816e0f996fbdbc33ecae0726cf0d842efc227937ff8c32e734c8b5be4c611ffbb27e5e038b4d95280c95ca60c53af1a47cf419cb06e5fab543c231f3
-SHA512 (lesspipe-2.20.tar.gz) = bfeba1b921959e8cde8ce8bcc75765598cefd2cc705aa5b6417592fdbdb0c43bd3efb0d4379a0514f0da86806988ee95219539974c7af3319595d9b03aac550e
+SHA512 (less-679.tar.gz) = f04e37dc4b2839b416a195e107d21328800e75080054788002c109b3b113a6a898b953391912e7538fb9843ef530b1991efc76dbf6fb5960e5530f3ff83421f6