From 04e2a6cb893cefad6fb4d1b12e2e74f86b7d526f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 23 Feb 2021 09:24:15 +1000
Subject: [PATCH] Update to mkfontscale 1.2.1 which obsoletes the separate
 mkfontdir.

---
 .gitignore                              |  1 -
 mkfontscale-examine-all-encodings.patch |  6 +++---
 sources                                 |  3 +--
 xorg-x11-font-utils.spec                | 14 ++++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca28633..a76ff17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 fonttosfnt-*.tar.bz2
 bdftopcf-*.tar.bz2
 mkfontscale-*.tar.bz2
-mkfontdir-*.tar.bz2
 font-util-*.tar.bz2
diff --git a/mkfontscale-examine-all-encodings.patch b/mkfontscale-examine-all-encodings.patch
index 1913915..217f0a4 100644
--- a/mkfontscale-examine-all-encodings.patch
+++ b/mkfontscale-examine-all-encodings.patch
@@ -2,9 +2,9 @@ diff --git a/mkfontscale.c b/mkfontscale.c
 index a67f283..96e19a3 100644
 --- a/mkfontscale.c
 +++ b/mkfontscale.c
-@@ -317,7 +317,7 @@ getName(FT_Face face, int nid)
-     int i;
- 
+@@ -326,7 +326,7 @@ getName(FT_Face face, int nid)
+     unsigned int i;
+
      if(getNameHelper(face, nid,
 -                     TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
 +                     TT_PLATFORM_MICROSOFT, -1, &name) ||
diff --git a/sources b/sources
index 75e7d23..05dd4b8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 SHA512 (bdftopcf-1.1.tar.bz2) = 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
 SHA512 (font-util-1.3.1.tar.bz2) = 9fd6dd4c0a01ede5f0b09ec0f9d316267ca086e2ee9526a43a4e4d6ce3cd67c977293bd3cf440328ca417292fcae1579888b24b7259eaf012230890210d74889
-SHA512 (mkfontdir-1.0.7.tar.bz2) = 96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f
-SHA512 (mkfontscale-1.1.3.tar.bz2) = 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
+SHA512 (mkfontscale-1.2.1.tar.bz2) = 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c
 SHA512 (fonttosfnt-1.2.1.tar.bz2) = 3d4ece61e31d4a5ed56923ecc1883e80a9308d2062d37345cb5be081bc2b004aadebf99a989601749a63e03eb641e0522d07773a57bca0b4710ed453e4f20742
diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec
index 951607a..deac0df 100644
--- a/xorg-x11-font-utils.spec
+++ b/xorg-x11-font-utils.spec
@@ -1,7 +1,6 @@
 %global bdftopcf 1.1
 %global fonttosfnt 1.2.1
-%global mkfontdir 1.0.7
-%global mkfontscale 1.1.3
+%global mkfontscale 1.2.1
 %global font_util 1.3.1
 
 # Must be kept in sync with xorg-x11-fonts!
@@ -11,13 +10,12 @@ Summary:    X.Org X11 font utilities
 Name:       xorg-x11-font-utils
 Epoch:      1
 Version:    7.5
-Release:    49%{?dist}
+Release:    50%{?dist}
 License:    MIT
 URL:        http://www.x.org
 
 Source0:    http://www.x.org/pub/individual/app/bdftopcf-%{bdftopcf}.tar.bz2
 Source1:    http://www.x.org/pub/individual/app/fonttosfnt-%{fonttosfnt}.tar.bz2
-Source2:    http://www.x.org/pub/individual/app/mkfontdir-%{mkfontdir}.tar.bz2
 Source3:    http://www.x.org/pub/individual/app/mkfontscale-%{mkfontscale}.tar.bz2
 Source4:    http://www.x.org/pub/individual/font/font-util-%{font_util}.tar.bz2
 # helper script used in post for xorg-x11-fonts
@@ -39,7 +37,8 @@ OrderWithRequires:  freetype
 
 Provides:   bdftopcf = %{bdftopcf}
 Provides:   fonttosfnt = %{fonttosfnt}
-Provides:   mkfontdir = %{mkfontdir}
+# mkfontdir used to be a separate package, it's now in mkfontscale
+Provides:   mkfontdir = %{mkfontscale}
 Provides:   mkfontscale = %{mkfontscale}
 Provides:   font-util = %{font_util}
 
@@ -51,7 +50,7 @@ X.Org X11 font utilities required for font installation, conversion, and
 generation.
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
+%setup -q -c %{name}-%{version} -a1 -a3 -a4
 pushd mkfontscale-*
 %patch0 -p1 -b .all-encodings
 popd
@@ -120,6 +119,9 @@ find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f
 %{_x11fontdir}/util/map-*
 
 %changelog
+* Tue Feb 23 2021 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-50
+- Update to mkfontscale 1.2.1 which obsoletes the separate mkfontdir.
+
 * Sun Feb 21 2021 Neal Gompa <ngompa13@gmail.com> - 1:7.5-49
 - Add OrderWithRequires for freetype to ensure freetype is installed first
 - Move license files to license tag on file list