From f453937c6c127f9890bcce50e7d586f26706ce3f Mon Sep 17 00:00:00 2001 From: wangshuo Date: Thu, 5 Jun 2025 14:41:40 +0800 Subject: [PATCH] fix file conflicts between groff and groff-x11 packages --- groff.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/groff.spec b/groff.spec index fdd6892..c2a3383 100644 --- a/groff.spec +++ b/groff.spec @@ -2,7 +2,7 @@ %{!?with_x:%global with_x 1} Name: groff Version: 1.22.4 -Release: 13 +Release: 14 Summary: A typesetting system License: GPLv3+ and GFDL-1.3-or-later and BSD and MIT URL: http://www.gnu.org/software/groff/ @@ -57,7 +57,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.22.4-8 +Conflicts: groff < 1.22.4-14 %description x11 The groff-x11 package contains the parts of the groff text processor @@ -136,9 +136,6 @@ make check %files %defattr(-,root,root) -%{_datadir}/%{name}/%{version}/font/devX*/ -%{_datadir}/%{name}/%{version}/tmac/X.tmac -%{_datadir}/%{name}/%{version}/tmac/Xps.tmac %{_datadir}/%{name}/%{version}/font/devcp1047/ %{_datadir}/%{name}/%{version}/font/devdvi/ %{_datadir}/%{name}/%{version}/font/devlbp/ @@ -324,6 +321,9 @@ make check %{_infodir}/groff.info* %changelog +* Thu Jun 05 2025 wangshuo - 1.22.4-14 +- fix file conflicts between groff and groff-x11 packages + * Mon Sep 02 2024 Linux_zhang - 1.22.4-13 - License compliance rectification -- Gitee