From 65c93de30d3c079589db65cff49a5ed94ee1a914 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Jul 13 2017 12:41:29 +0000 Subject: Fix including roff files --- diff --git a/cook-2.34-Fix-including-roff-files.patch b/cook-2.34-Fix-including-roff-files.patch new file mode 100644 index 0000000..6ba372d --- /dev/null +++ b/cook-2.34-Fix-including-roff-files.patch @@ -0,0 +1,48 @@ +From f801f0bbfd1f2d09a42e53e2e773972d1b32c283 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 13 Jul 2017 14:19:14 +0200 +Subject: [PATCH] Fix including roff files +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(1) Remove table heading from included lib/en/readme/main.man + +lib/en/refman/main.man includes lib/en/readme/main.man, thus groff +dies on spurious .TH in the middle of the document: + +$ groff -Tps -s -p -t -mm -I../../etc lib/en/refman/main.man >/dev/null +****************** +ERROR:(./lib/en/readme/main.man) input line 23:.TH without .TS H +****************** +"Input aborted, syntax error" + +(2) Correct path to version.so: + +$ groff -Tps -s -p -t -mm -I../../etc lib/en/refman/main.man >/dev/null +soelim:./lib/en/readme/main.man:24: can't open `../etc/version.so': No such file or directory +./lib/en/readme/main.man:24: can't open `../etc/version.so': No such file or directory + +Signed-off-by: Petr Písař +--- + lib/en/readme/main.man | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/en/readme/main.man b/lib/en/readme/main.man +index 8ef61f3..d1ffc7d 100644 +--- a/lib/en/readme/main.man ++++ b/lib/en/readme/main.man +@@ -20,8 +20,8 @@ + .if n .ftr CI I + .if n .ftr CW R + .if n .ftr C R +-.TH "Read Me" Cook Cook "Reference Manual" +-.so ../etc/version.so ++.\" .TH "Read Me" Cook Cook "Reference Manual" ++.so etc/version.so + .hy 0 + .ad l + .SH NAME +-- +2.9.4 + diff --git a/cook.spec b/cook.spec index 7c8d30f..67bcbea 100644 --- a/cook.spec +++ b/cook.spec @@ -8,6 +8,8 @@ Group: Development/Tools License: GPLv2+ URL: http://miller.emu.id.au/pmiller/software/cook Source: http://miller.emu.id.au/pmiller/software/cook/cook-%{version}.tar.gz +# Fix including roff files, bug #1307402 +Patch0: cook-2.34-Fix-including-roff-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: groff BuildRequires: bison @@ -28,15 +30,16 @@ mechanism to define these. %prep %setup -q +%patch0 -p1 %build %configure --libdir=%{_datadir} # _smp_mflags breaks the build make # %{?_smp_mflags} -groff -Tps -s -p -t -mm lib/en/tutorial/main.mm > tutorial.ps -groff -Tps -s -p -t -mm lib/en/user-guide/main.mm > user-guide.ps -groff -Tps -s -p -t -mm lib/en/refman/main.man > refman.ps +groff -Tps -s -p -t -mm -I../../etc lib/en/tutorial/main.mm > tutorial.ps +groff -Tps -s -p -t -mm -I../../etc lib/en/user-guide/main.mm > user-guide.ps +groff -Tps -s -p -t -mm -I../../etc lib/en/refman/main.man > refman.ps for f in *.ps; do ps2pdf $f done @@ -75,6 +78,7 @@ rm -fr ${RPM_BUILD_ROOT} %changelog * Thu Jul 13 2017 Petr Pisar - 2.34-14 - Do not use broken grog for generating documentation (bug #1307402) +- Fix including roff files (bug #1307402) * Thu Jul 13 2017 Petr Pisar - 2.34-13 - perl dependency renamed to perl-interpreter