From 1222d2bf7a4f104deaf1f3d5df235764c80cbd58 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 21 Dec 2023 16:19:35 -0500 Subject: [PATCH] Avoid pandoc dependency on RHEL pandoc is unwanted in RHEL, but the upstream source tarball includes a pre-built copy of the manpage. --- wget2.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/wget2.spec b/wget2.spec index 17ae9aa..e626006 100644 --- a/wget2.spec +++ b/wget2.spec @@ -8,7 +8,7 @@ Name: wget2 Version: 2.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced file and recursive website downloader # Documentation is GFDL @@ -32,7 +32,9 @@ BuildRequires: make # Documentation build requirements BuildRequires: doxygen BuildRequires: git-core +%if ! 0%{?rhel} BuildRequires: pandoc +%endif # Wget2 build requirements BuildRequires: bzip2-devel @@ -133,6 +135,11 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_install %find_lang %{name} +%if 0%{?rhel} +# tarball includes a pre-built manpage +install -D -m0644 -t %{buildroot}%{_mandir}/man1/ docs/man/man1/wget2.1 +%endif + # Purge all libtool archives find %{buildroot} -type f -name "*.la" -delete -print @@ -174,6 +181,10 @@ echo ".so man1/%{name}.1" > %{buildroot}%{_mandir}/man1/wget.1 %changelog +* Thu Dec 21 2023 Yaakov Selkowitz - 2.1.0-4 +- Avoid pandoc dependency on RHEL +- Fix tests on RHEL + * Sat Dec 16 2023 Neal Gompa - 2.1.0-3 - Enable wget2-wget for F40+ / RHEL10+