From 06079c70b7aba4876738b4ee379819b1716a2ac260acdae4463ff98220c2a80a Mon Sep 17 00:00:00 2001 From: Antonio Teixeira Date: Fri, 6 Oct 2023 20:31:06 +0000 Subject: [PATCH] Accepting request 1115698 from home:luc14n0:branches:M17N Fix roff-gf.7.gz file ending up uncrompressed, despite the name OBS-URL: https://build.opensuse.org/request/show/1115698 OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=95 --- groff.changes | 15 +++++++++++++++ groff.spec | 15 +++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/groff.changes b/groff.changes index 072a639..e80c55e 100644 --- a/groff.changes +++ b/groff.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Oct 4 23:01:54 UTC 2023 - Luciano Santos + +- Define ext_man="%{?ext_man}%{!?ext_man:.gz}" shell variable in + the install directive, and replace "%{?ext_man}" with + "${ext_man:-}" to fix groff-gf.7.gz file ending up uncompressed + (despite the name) due to the use of %{?ext_man} in the mv/ln + TARGET parameter used for the preparation of Alternatives. Also + define a simple shell contruct which identifies whether the + manpage file is compressed. If not, it unsets the $ext_man + variable, then ajdusting the mv/ln calls. That's all necessary + because even though ext_man macro is defined, it doesn't mean the + file has the extension (which dependes whether the build script + compresses it). + ------------------------------------------------------------------- Fri Sep 8 19:42:28 UTC 2023 - Antonio Teixeira diff --git a/groff.spec b/groff.spec index cd90f0d..dae8e08 100644 --- a/groff.spec +++ b/groff.spec @@ -193,10 +193,17 @@ rm -f %{buildroot}%{_mandir}/man1/troff.1* # Prepare alternatives find %{buildroot}%{_mandir} mkdir -p %{buildroot}%{_sysconfdir}/alternatives -mv -v %{buildroot}%{_mandir}/man7/roff.7* \ - %{buildroot}%{_mandir}/man7/roff-gf.7%{?ext_man} -ln -s -f %{_sysconfdir}/alternatives/roff.7%{?ext_man} \ - %{buildroot}%{_mandir}/man7/roff.7%{?ext_man} + +## This construct should help identify whether the manpage is compressed, +## and the mv/ln TARGET parameter should be adjusted accordingly. +ext_man="%{?ext_man}%{!?ext_man:.gz}" +manfile="$(find %{buildroot}%{_mandir}/man7/ -type f -name "roff.7${ext_man}")" +test -z "${manfile}" && unset ext_man + +mv -v "%{buildroot}%{_mandir}/man7/roff.7${ext_man:-}" \ + "%{buildroot}%{_mandir}/man7/roff-gf.7${ext_man:-}" +ln -s -f "%{_sysconfdir}/alternatives/roff.7${ext_man:-}" \ + "%{buildroot}%{_mandir}/man7/roff.7${ext_man:-}" # full_build %else # fix permission for devps/generate/afmname