From 2cb66cc6acf4dcd802a28603e8e66d89d0bbed0e Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sun, 21 Feb 2021 21:50:25 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/xorg-x11-font-utils.git#3f6e76ab132da44d2196c035492b34c37df4e4e8 --- xorg-x11-font-utils.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index f970cb1..951607a 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -11,7 +11,7 @@ Summary: X.Org X11 font utilities Name: xorg-x11-font-utils Epoch: 1 Version: 7.5 -Release: 48%{?dist} +Release: 49%{?dist} License: MIT URL: http://www.x.org @@ -34,6 +34,9 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: zlib-devel +# Ensure that freetype is installed before this is when in the same transaction +OrderWithRequires: freetype + Provides: bdftopcf = %{bdftopcf} Provides: fonttosfnt = %{fonttosfnt} Provides: mkfontdir = %{mkfontdir} @@ -96,7 +99,8 @@ install -m 744 -p -D %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/xorg-x11-fonts-up find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f %files -%doc README-* COPYING-bdftopcf COPYING-[c-z]* +%doc README-* +%license COPYING-bdftopcf COPYING-[c-z]* %{_bindir}/bdftopcf %{_bindir}/fonttosfnt %{_bindir}/mkfontdir @@ -116,6 +120,10 @@ find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f %{_x11fontdir}/util/map-* %changelog +* Sun Feb 21 2021 Neal Gompa - 1:7.5-49 +- Add OrderWithRequires for freetype to ensure freetype is installed first +- Move license files to license tag on file list + * Thu Jan 28 2021 Fedora Release Engineering - 1:7.5-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild