From 9b28bc1165efa2914364a664db1ff25e9df105e8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 8 Apr 2021 15:00:15 +1000 Subject: [PATCH] Fix the Conflicts line to properly conflict with the -50 font-utils, without a {?dist} <= doesn't work as expected. --- mkfontscale.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mkfontscale.spec b/mkfontscale.spec index a9d359f..7feb978 100644 --- a/mkfontscale.spec +++ b/mkfontscale.spec @@ -1,6 +1,6 @@ Name: mkfontscale Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to generate legacy X11 font system index files License: MIT @@ -16,7 +16,7 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: zlib-devel -Conflicts: xorg-x11-font-utils <= 7.5-50 +Conflicts: xorg-x11-font-utils < 7.5-51 # Used to be a separate upstream repo in xorg-x11-font-utils, now it's part # of mkfontscale. Keep the Provides alive though. @@ -45,6 +45,10 @@ distributed separately for compatibility with older X11 versions. %{_mandir}/man1/mkfontscale.1* %changelog +* Thu Apr 08 2021 Peter Hutterer 1.2.1-2 +- Fix the Conflicts line to properly conflict with the -50 font-utils, + without a {?dist} <= doesn't work as expected. + * Thu Feb 25 2021 Peter Hutterer 1.2.1-1 - Split mkfontscale/mkfontdir out from xorg-x11-font-utils into its own package (#1932734)