From a7992b4bcf82900731327f9ed1e4f9c637444e16 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 8 Jan 2023 16:00:37 +0000 Subject: [PATCH] groff: Update to 1.22.4 Signed-off-by: Michael Tremer --- groff/groff.nm | 20 ++++----- ...te-font-and-site-tmac-from-etc-groff.patch | 43 ------------------- 2 files changed, 8 insertions(+), 55 deletions(-) delete mode 100644 groff/patches/0002-load-site-font-and-site-tmac-from-etc-groff.patch diff --git a/groff/groff.nm b/groff/groff.nm index 1b097c7e4..cdf877aeb 100644 --- a/groff/groff.nm +++ b/groff/groff.nm @@ -4,13 +4,13 @@ ############################################################################### name = groff -version = 1.22.3 +version = 1.22.4 release = 1 groups = Applications/Text -url = http://groff.ffii.org/ +url = https://groff.ffii.org/ license = GPLv2 and GFDL -summary = A document formatting system. +summary = A document formatting system description Groff is a document formatting system. Groff takes standard text and @@ -21,7 +21,7 @@ description more. end -source_dl = http://ftp.gnu.org/gnu/%{name}/ +source_dl = https://ftp.gnu.org/gnu/%{name}/ build requires @@ -33,8 +33,9 @@ build texinfo end - # Cannot run in parallel - PARALLELISMFLAGS = + # Install man-pages only + configure_options += \ + --with-doc=no install_cmds for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim; do @@ -46,12 +47,7 @@ end packages package %{name} - filter_requires - main_subs.pl - man.pl - oop_fh.pl - subs.pl - end + filter_requires = (main_subs|man|oop_fh|subs)\.pl end package %{name}-debuginfo diff --git a/groff/patches/0002-load-site-font-and-site-tmac-from-etc-groff.patch b/groff/patches/0002-load-site-font-and-site-tmac-from-etc-groff.patch deleted file mode 100644 index 163f784ff..000000000 --- a/groff/patches/0002-load-site-font-and-site-tmac-from-etc-groff.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c6d8bb3e0ebc03274564d7b2c768e9932cc5f79d Mon Sep 17 00:00:00 2001 -From: Jan Vcelak -Date: Tue, 1 Jan 2013 15:33:45 +0100 -Subject: [PATCH] load site-font and site-tmac from /etc/groff - -Move site-font and site-tmac configuration from /usr/share/groff to -/etc/groff. That allows permanent custom changes. (Symlinking brought -a lot of problems with RPM. This is safer and cleaner.) - -Signed-off-by: Jan Vcelak ---- - Makefile.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 7534e56..d97d1b9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -167,7 +167,7 @@ fontdir=$(datasubdir)/font - oldfontdir=$(datasubdir)/oldfont - - # `localfontdir' says where local fonts will be installed (as dev*/*). --localfontdir=$(dataprogramdir)/site-font -+localfontdir=@sysconfdir@/groff/site-font - - # `legacyfontdir' is for compatibility with non-GNU troff. - legacyfontdir=/usr/lib/font -@@ -179,10 +179,10 @@ fontpath=$(localfontdir)$(RT_SEP)$(fontdir)$(RT_SEP)$(legacyfontdir) - tmacdir=$(datasubdir)/tmac - - # `systemtmacdir' says where to install platform-dependent macros. --systemtmacdir=$(libprogramdir)/site-tmac -+systemtmacdir=@sysconfdir@/groff/site-tmac - - # `localtmacdir' says where local files will be installed. --localtmacdir=$(dataprogramdir)/site-tmac -+localtmacdir=@sysconfdir@/groff/site-tmac - - # `appresdir' says where to install the application resource file for - # gxditview. --- -1.8.0.2 - -- 2.39.5