backport-nroff-map-CW-to-R.patch

@@ -1,42 +0,0 @@
-From 742dfac36f1fd23e17d27dbf83e3793d3f3a063d Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Fri, 14 Jul 2023 12:42:26 +0100
-Subject: Map CW to R for nroff
-
-Bug-Debian: https://bugs.debian.org/1040975
-Last-Update: 2023-07-14
-
-Patch-Name: nroff-map-CW-to-R.patch
----
- tmac/man.local  | 2 +-
- tmac/mdoc.local | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tmac/man.local b/tmac/man.local
-index 5daa507..0940dc1 100644
---- a/tmac/man.local
-+++ b/tmac/man.local
-@@ -12,7 +12,7 @@
- .\" Uncomment this to suppress warnings produced by such pages.  This
- .\" test remaps the font to roman ("R") on nroff (terminal) devices. You
- .\" might prefer to remap it to bold ("B") instead.
--.\" .if n .ftr CW R
-+.if n .ftr CW R
- .\"
- .\" A de facto standard URL format for man pages is recognized
- .\" everywhere except Apple, where different macOS applications expect
-diff --git a/tmac/mdoc.local b/tmac/mdoc.local
-index 94688ab..66dcc42 100644
---- a/tmac/mdoc.local
-+++ b/tmac/mdoc.local
-@@ -6,7 +6,7 @@
- .\" Uncomment this to suppress warnings produced by such pages.  This
- .\" test remaps the font to roman ("R") on nroff (terminal) devices. You
- .\" might prefer to remap it to bold ("B") instead.
--.\" .if n .ftr CW R
-+.if n .ftr CW R
- .\"
- .\" Local Variables:
- .\" mode: nroff
--- 
-2.33.0

groff.spec

@@ -1,19 +1,17 @@
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\([^.]*\\.pl\\)
 %{!?with_x:%global with_x 1}
 Name: groff
-Version: 1.23.0
+Version: 1.22.4
-Release: 3
+Release: 10
 Summary: A typesetting system
-License: GPLv3+ and GFDL-1.3-or-later and BSD and MIT
+License: GPLv3+ and GFDL and BSD and MIT
 URL: http://www.gnu.org/software/groff/
 Source: http://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
 
-Patch6000:     backport-nroff-map-CW-to-R.patch
-
 BuildRequires: gcc, gcc-c++ texinfo
 BuildRequires: git, netpbm-progs, perl-generators, psutils, ghostscript
 BuildRequires: libXaw-devel, libXmu-devel
-BuildRequires: jbig2dec-libs m4
+BuildRequires: jbig2dec-libs 
 Requires:      coreutils
 Requires:     %{name}-base = %{version}-%{release}
 
@@ -57,7 +55,7 @@ Requires: groff-base = %{version}-%{release}
 BuildRequires: libXaw-devel, libXmu-devel
 Provides: groff-gxditview = %{version}-%{release}
 Obsoletes: groff-gxditview < 1.20.1
-Conflicts: groff < 1.23.0-1
+Conflicts: groff < 1.22.4-8
 
 %description x11
 The groff-x11 package contains the parts of the groff text processor
@@ -109,7 +107,7 @@ sed --in-place 's/\.pfa$/.pfa_/' %{buildroot}%{_datadir}/%{name}/%{version}/font
 rm -f %{buildroot}%{_infodir}/dir
 
 # fix privileges
-#chmod 755 %{buildroot}%{_datadir}/groff/%{version}/groffer/version.sh
+chmod 755 %{buildroot}%{_datadir}/groff/%{version}/groffer/version.sh
 chmod 755 %{buildroot}%{_datadir}/groff/%{version}/font/devlj4/generate/special.awk
 
 # remove CreationDate
@@ -135,7 +133,6 @@ make check
 %files
 %defattr(-,root,root)
 %{_datadir}/%{name}/%{version}/font/devX*/
-%{_datadir}/%{name}/%{version}/font/FontMap-X11
 %{_datadir}/%{name}/%{version}/tmac/X.tmac
 %{_datadir}/%{name}/%{version}/tmac/Xps.tmac
 %{_datadir}/%{name}/%{version}/font/devcp1047/
@@ -143,13 +140,14 @@ make check
 %{_datadir}/%{name}/%{version}/font/devlbp/
 %{_datadir}/%{name}/%{version}/font/devlj4/
 %{_datadir}/%{name}/%{version}/font/devpdf/
+%{_datadir}/%{name}/%{version}/groffer/
 %{_datadir}/%{name}/%{version}/oldfont/
 %{_datadir}/%{name}/%{version}/pic/
 %{_datadir}/%{name}/%{version}/tmac/62bit.tmac
+%{_datadir}/%{name}/%{version}/tmac/a4.tmac
 %{_datadir}/%{name}/%{version}/tmac/dvi.tmac
 %{_datadir}/%{name}/%{version}/tmac/e.tmac
 %{_datadir}/%{name}/%{version}/tmac/ec.tmac
-%{_datadir}/%{name}/%{version}/tmac/en.tmac
 %{_datadir}/%{name}/%{version}/tmac/hdmisc.tmac
 %{_datadir}/%{name}/%{version}/tmac/hdtbl.tmac
 %{_datadir}/%{name}/%{version}/tmac/lbp.tmac
@@ -198,10 +196,17 @@ make check
 %{_bindir}/gperl
 %{_bindir}/gpinyin
 %{_bindir}/glilypond
+%{_bindir}/groffer
 %{_bindir}/grog
 %{_bindir}/gropdf
 %{_bindir}/mmroff
 %{_bindir}/pdfmom
+%{_bindir}/roff2dvi
+%{_bindir}/roff2html
+%{_bindir}/roff2pdf
+%{_bindir}/roff2ps
+%{_bindir}/roff2text
+%{_bindir}/roff2x
 
 %files base
 %license COPYING FDL LICENSES
@@ -217,6 +222,7 @@ make check
 %{_datadir}/%{name}/%{version}/font/devutf8/
 %{_datadir}/%{name}/%{version}/font/devhtml/
 %{_datadir}/%{name}/%{version}/tmac/an-ext.tmac
+%{_datadir}/%{name}/%{version}/tmac/an-old.tmac
 %{_datadir}/%{name}/%{version}/tmac/an.tmac
 %{_datadir}/%{name}/%{version}/tmac/andoc.tmac
 %{_datadir}/%{name}/%{version}/tmac/composite.tmac
@@ -236,13 +242,11 @@ make check
 %{_datadir}/%{name}/%{version}/tmac/hyphen.cs
 %{_datadir}/%{name}/%{version}/tmac/hyphen.den
 %{_datadir}/%{name}/%{version}/tmac/hyphen.det
-%{_datadir}/%{name}/%{version}/tmac/hyphen.en
 %{_datadir}/%{name}/%{version}/tmac/hyphen.fr
-%{_datadir}/%{name}/%{version}/tmac/hyphen.it
 %{_datadir}/%{name}/%{version}/tmac/hyphen.sv
+%{_datadir}/%{name}/%{version}/tmac/hyphen.us
 %{_datadir}/%{name}/%{version}/tmac/hyphenex.cs
-%{_datadir}/%{name}/%{version}/tmac/hyphenex.en
+%{_datadir}/%{name}/%{version}/tmac/hyphenex.us
-%{_datadir}/%{name}/%{version}/tmac/it.tmac
 %{_datadir}/%{name}/%{version}/tmac/ja.tmac
 %{_datadir}/%{name}/%{version}/tmac/latin1.tmac
 %{_datadir}/%{name}/%{version}/tmac/latin2.tmac
@@ -259,16 +263,14 @@ make check
 %{_datadir}/%{name}/%{version}/tmac/psatk.tmac
 %{_datadir}/%{name}/%{version}/tmac/psold.tmac
 %{_datadir}/%{name}/%{version}/tmac/pspic.tmac
-%{_datadir}/%{name}/%{version}/tmac/ptx.tmac
+%{_datadir}/%{name}/%{version}/tmac/safer.tmac
-%{_datadir}/%{name}/%{version}/tmac/rfc1345.tmac
-%{_datadir}/%{name}/%{version}/tmac/sanitize.tmac
-%{_datadir}/%{name}/%{version}/tmac/sboxes.tmac
 %{_datadir}/%{name}/%{version}/tmac/sv.tmac
 %{_datadir}/%{name}/%{version}/tmac/trans.tmac
 %{_datadir}/%{name}/%{version}/tmac/troffrc
 %{_datadir}/%{name}/%{version}/tmac/troffrc-end
 %{_datadir}/%{name}/%{version}/tmac/tty-char.tmac
 %{_datadir}/%{name}/%{version}/tmac/tty.tmac
+%{_datadir}/%{name}/%{version}/tmac/unicode.tmac
 %{_datadir}/%{name}/%{version}/tmac/www.tmac
 %{_datadir}/%{name}/site-tmac/*
 %{_bindir}/eqn
@@ -300,8 +302,8 @@ make check
 %{_datadir}/%{name}/%{version}/font/devX*/
 %{_datadir}/%{name}/%{version}/tmac/X.tmac
 %{_datadir}/%{name}/%{version}/tmac/Xps.tmac
-%{_prefix}/lib/X11/app-defaults/GXditview
+%{_datadir}/X11/app-defaults/GXditview
-%{_prefix}/lib/X11/app-defaults/GXditview-color
+%{_datadir}/X11/app-defaults/GXditview-color
 # programs
 %{_bindir}/gxditview
 %{_bindir}/xtotroff
@@ -318,21 +320,6 @@ make check
 %{_infodir}/groff.info*
 
 %changelog
-* Thu Jun 13 2024 zhangruifang <zhangruifang@h-partners.com> - 1.23.0-3
-- License compliance rectification
-
-* Thu Aug 10 2023 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.23.0-2
-- Fix other build failures that depend on package groff-base(https://bugs.debian.org/1040975) 
-
-* Tue Jul 18 2023 dillon chen <dillonchen@gmail.com> - 1.23.0-1
-- update to 1.23.0
-
-* Mon Mar 13 2023 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.22.4-12
-- enable make check
-
-* Tue Feb 14 2023 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.22.4-11
-- disable make check to fix build failed
-
 * Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.22.4-10
 - rebuild for next release