From 391510da8f1ca3d1d7e0674d761249be24b9aef4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:07:43 +0000
Subject: import xorg-x11-font-utils-7.5-21.el7


---

diff --git a/.gitignore b/.gitignore
index 50ede10..91e80cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-SOURCES/bdftopcf-1.0.4.tar.bz2
-SOURCES/font-util-1.3.0.tar.bz2
-SOURCES/fonttosfnt-1.0.3.tar.bz2
+SOURCES/bdftopcf-1.1.tar.bz2
+SOURCES/font-util-1.3.1.tar.bz2
+SOURCES/fonttosfnt-1.0.4.tar.bz2
 SOURCES/mkfontdir-1.0.7.tar.bz2
-SOURCES/mkfontscale-1.1.0.tar.bz2
+SOURCES/mkfontscale-1.1.3.tar.bz2
diff --git a/.xorg-x11-font-utils.metadata b/.xorg-x11-font-utils.metadata
index f61a5bc..18c5243 100644
--- a/.xorg-x11-font-utils.metadata
+++ b/.xorg-x11-font-utils.metadata
@@ -1,5 +1,5 @@
-6010f4748d30007ebfeaa8cb053ec3c2e9bbda34 SOURCES/bdftopcf-1.0.4.tar.bz2
-a015f4c5a35d98af72835797293697e0eb9cd506 SOURCES/font-util-1.3.0.tar.bz2
-8ef6ddfa7d010416dba251c37655a2629887db2f SOURCES/fonttosfnt-1.0.3.tar.bz2
+48a783337a5aa49ebc102c9788ff0f43ea35c5c4 SOURCES/bdftopcf-1.1.tar.bz2
+0b16add3637c64b0bbaf1dd223b71b0421100c20 SOURCES/font-util-1.3.1.tar.bz2
+a609fba513947e5267c924f85774c0e44a076a7d SOURCES/fonttosfnt-1.0.4.tar.bz2
 3c06dad8a5fbf7362b51fb7d6b1ab805eba40336 SOURCES/mkfontdir-1.0.7.tar.bz2
-ba021369ae3b364ba083b9eb5e570e54b21fd583 SOURCES/mkfontscale-1.1.0.tar.bz2
+2fdbd7c6cc5b0678f2c5d10d2350a809d576e9e5 SOURCES/mkfontscale-1.1.3.tar.bz2
diff --git a/SOURCES/mkfontscale-man-page-additions.patch b/SOURCES/mkfontscale-man-page-additions.patch
deleted file mode 100644
index 295f43c..0000000
--- a/SOURCES/mkfontscale-man-page-additions.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 19e2cb7c6a3ec2c5b1bc0d24866fa685eef0ee13 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 21 May 2013 15:50:19 +1000
-Subject: [PATCH mkfontscale] Document -u/-U options in man page
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
- man/mkfontscale.man | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/man/mkfontscale.man b/man/mkfontscale.man
-index 4ed3d7d..4aa88ab 100644
---- a/man/mkfontscale.man
-+++ b/man/mkfontscale.man
-@@ -36,6 +36,8 @@ mkfontscale \- create an index of scalable font files for X
- .B \-n
- .I prefix
- ] [
-+.B \-u | \-U
-+] [
- .B \-\-
- ] [
- .I directory
-@@ -126,6 +128,10 @@ options.
- do not scan for fonts, do not write font directory files.  This option
- is useful when generating encoding directories only.
- .TP
-+.B \-u, \-U
-+disable (\fI-u\fP) or enable (\fI-U\fP) indexing of ISO 10646:1 font
-+encodings (default: enabled).
-+.TP
- .B \-\-
- end of options.
- .SH SEE ALSO
--- 
-1.8.1.4
-
diff --git a/SPECS/xorg-x11-font-utils.spec b/SPECS/xorg-x11-font-utils.spec
index 8591315..1c726fb 100644
--- a/SPECS/xorg-x11-font-utils.spec
+++ b/SPECS/xorg-x11-font-utils.spec
@@ -1,27 +1,26 @@
 %define pkgname font-utils
-%define mkfontscale 1.1.0
+%define mkfontscale 1.1.3
 
 Summary: X.Org X11 font utilities
 Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 7.5
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 
-Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.4.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.1.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.4.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.7.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-%{mkfontscale}.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.3.0.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.3.1.tar.bz2
 # helper script used in %post for xorg-x11-fonts
 Source5: xorg-x11-fonts-update-dirs
 Source6: xorg-x11-fonts-update-dirs.1
 
 Patch2: mkfontscale-examine-all-encodings.patch
-Patch3: mkfontscale-man-page-additions.patch
 
 BuildRequires: pkgconfig(xfont) pkgconfig(x11)
 BuildRequires: libfontenc-devel >= 0.99.2-2
@@ -46,7 +45,6 @@ and generation.
 oldpwd=$(pwd)
 cd mkfontscale-%{mkfontscale}
 %patch2 -p1 -b .all-encodings
-%patch3 -p1
 cd ${oldpwd}
 
 %build
@@ -114,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xorg-x11-fonts-update-dirs.1*
 
 %changelog
+* Thu May 17 2018 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-21
+- Rebase to F28 (#1564630)
+
 * Tue May 12 2015 Peter Robinson <pbrobinson@redhat.com> 1:7.5-20
 - rebuild