[packages/lesspipe] - up to 2.22

[baggins]

commit 228d411b9342c5cc99a49dc59221da3a2cf962d2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 20 17:13:07 2025 +0100

    - up to 2.22

 lesspipe-completionsdir.patch | 15 ---------------
 lesspipe.spec                 | 16 ++++++----------
 no-7z-tests.patch             | 17 -----------------
 no-libreoffice-tests.patch    | 23 +++++++++++++++++++++++
 4 files changed, 29 insertions(+), 42 deletions(-)
---
diff --git a/lesspipe.spec b/lesspipe.spec
index af88184..9c4a8f3 100644
--- a/lesspipe.spec
+++ b/lesspipe.spec
@@ -3,17 +3,14 @@
 Summary:	Input preprocessor for less
 Summary(pl.UTF-8):	Preprocesor wejścia dla narzędzia less
 Name:		lesspipe
-Version:	2.18
+Version:	2.22
 Release:	1
 License:	GPL v2
 Group:		Applications/Text
 #Source0Download: https://github.com/wofr06/lesspipe/releases
-# TODO: use named tarballs:
-#Source0:	https://github.com/wofr06/lesspipe/archive/v%{version}/%{name}-%{version}.tar.gz
-Source0:	https://github.com/wofr06/lesspipe/archive/refs/tags/v%{version}.tar.gz
-# Source0-md5:	f0619d594621a27ed84c4136f14d412f
-Patch0:		%{name}-completionsdir.patch
-Patch1:		no-7z-tests.patch
+Source0:	https://github.com/wofr06/lesspipe/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	7fc32893e813d82d6f4cce3e1c44976d
+Patch0:		no-libreoffice-tests.patch
 URL:		https://www-zeuthen.desy.de/~friebel/unix/lesspipe.html
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.719
@@ -50,12 +47,10 @@ różnych archiwów w sposób czytelny dla człowieka.
 %prep
 %setup -q
 %patch -P0 -p1
-%patch -P1 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \
       archive_color \
       code2color \
-      sxw2txt \
       vimcolor
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
@@ -64,6 +59,7 @@ różnych archiwów w sposób czytelny dla człowieka.
 %build
 ./configure \
     --prefix=%{_prefix} \
+    --bash-completion-dir=%{bash_compdir} \
     --shell=/bin/bash
 
 %{__make}
@@ -72,7 +68,7 @@ różnych archiwów w sposób czytelny dla człowieka.
       lesspipe.sh
 
 %if %{with tests}
-%{__make} test
+./test.pl -v -e
 %endif
 
 %install
diff --git a/lesspipe-completionsdir.patch b/lesspipe-completionsdir.patch
deleted file mode 100644
index 52c7ccb..0000000
--- a/lesspipe-completionsdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lesspipe-2.18/configure.orig	2025-02-16 21:25:26.000000000 +0100
-+++ lesspipe-2.18/configure	2025-03-23 12:04:07.106017531 +0100
-@@ -141,10 +141,10 @@ install:
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/zsh/site-functions
--	mkdir -p $(DESTDIR)$(PREFIX)/share/bash-completion/
-+	mkdir -p $(DESTDIR)$(PREFIX)/share/bash-completion/completions
- 	cp ./code2color ./sxw2txt ./archive_color ./lesspipe.sh ./vimcolor ./lesscomplete $(DESTDIR)$(PREFIX)/bin
- 	cp ./lesspipe.1 $(DESTDIR)$(PREFIX)/share/man/man1
--	cp ./less_completion $(DESTDIR)$(PREFIX)/share/bash-completion/
-+	cp ./less_completion $(DESTDIR)$(PREFIX)/share/bash-completion/completions
- 	cp ./_less $(DESTDIR)$(PREFIX)/share/zsh/site-functions
- 	chmod 0755 $(DESTDIR)$(PREFIX)/bin/lesspipe.sh
- 	chmod 0755 $(DESTDIR)$(PREFIX)/bin/sxw2txt
diff --git a/no-7z-tests.patch b/no-7z-tests.patch
deleted file mode 100644
index 15bfc3e..0000000
--- a/no-7z-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- lesspipe-2.18/test.pl~	2025-02-16 21:25:26.000000000 +0100
-+++ lesspipe-2.18/test.pl	2025-12-20 13:08:33.329983041 +0100
-@@ -287,14 +287,6 @@
- = test
- 33 less tests/archive.tgz:test_cab:a\ text.gz	# (on the fly), needs cabextract
- = test
--34 less $T/tests/test_7z			# 7z contents, needs 7zz|7zr|7za
--~ .* testok/aaa.txt
--35 less tests/archive.tgz:test_7z		# (on the fly), needs 7zz|7zr|7za
--~ .* testok/aaa.txt
--36 less $T/tests/test_7z:testok/a\|b.txt	# extract file from 7z, needs 7zz|7zr|7za
--= test
--37 less tests/archive.tgz:test_7z:testok/a\|b.txt	# (on the fly), needs 7zz|7zr|7za
--= test
- 38 less $T/tests/test_iso			# iso9660 contents, needs bsdtar|isoinfo
- ~ .* ISO.TXT|/ISO.TXT;1
- 39 less tests/archive.tgz:test_iso		# (on the fly), needs bsdtar|isoinfo
diff --git a/no-libreoffice-tests.patch b/no-libreoffice-tests.patch
new file mode 100644
index 0000000..333671d
--- /dev/null
+++ b/no-libreoffice-tests.patch
@@ -0,0 +1,23 @@
+--- lesspipe-2.22/test.pl~	2025-12-20 16:59:16.000000000 +0100
++++ lesspipe-2.22/test.pl	2025-12-20 17:04:29.546648913 +0100
+@@ -351,20 +351,10 @@
+ ~ public class test
+ 65 less tests/filter.tgz:test_docx		# docx (neu) git #24,26,27,37, needs pandoc|docx2txt|libreoffice
+ = test
+-66 less tests/filter.tgz:test_pptx		# pptx (neu), needs pptx2md,pandoc|libreoffice,html_converter
+-~ processing slide 1...|.*test.*
+ 67 less tests/filter.tgz:test_xlsx		# xlsx (neu), needs in2csv|xlscat|excel2csv|libreoffice
+ ~ ^test$
+-68 less tests/filter.tgz:test_odt		# odt, needs pandoc|odt2txt|libreoffice
+-= test
+-69 less tests/filter.tgz:test_odp		# odp, needs libreoffice,html_converter
+-~ \s*test
+-70 less tests/filter.tgz:test_ods		# ods, needs xlscat|libreoffice,html_converter
+-~ test
+ 71 less tests/filter.tgz:test_doc		# doc (old), needs wvText|catdoc|libreoffice
+ ~  *test
+-72 less tests/filter.tgz:test_ppt:ms-powerpoint	# ppt (old), catppt not always working, needs libreoffice,html_converter
+-~ .*1. test|\s*test
+ 73 less tests/filter.tgz:test_xls		# xls (old), needs in2csv|xls2csv|libreoffice,html_converter
+ ~ ^test$|^"test"$
+ 74 less tests/filter.tgz:test_ooffice1	# openoffice1 (very old), needs odt2txt
================================================================

---- gitweb:

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