From 5f8fbb449fc8dd860b0c5cf7e0e1e16a4738123c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Apr 08 2021 04:58:49 +0000 Subject: Fix the Conflicts line to properly conflict with the -50 font-utils, without a {?dist} <= doesn't work as expected. --- diff --git a/bdftopcf.spec b/bdftopcf.spec index e977b2a..d0e4f7c 100644 --- a/bdftopcf.spec +++ b/bdftopcf.spec @@ -1,6 +1,6 @@ Name: bdftopcf Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Font compiler for the X server and font server License: MIT @@ -11,7 +11,7 @@ BuildRequires: gcc make libtool BuildRequires: pkgconfig(x11) pkgconfig(fontsproto) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -Conflicts: xorg-x11-font-utils <= 7.5-50 +Conflicts: xorg-x11-font-utils < 7.5-51 %description bdftopcf is a font compiler for the X server and font server. Fonts @@ -37,6 +37,10 @@ slowly) on other machines. %{_mandir}/man1/bdftopcf.1* %changelog +* Thu Apr 08 2021 Peter Hutterer 1.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.1-1 - Split bdftopcf out from xorg-x11-font-utils into its own package (#1932736)