0001-mkfontscale-examine-all-encodings.patch

@@ -1,13 +0,0 @@
-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;
- 
-     if(getNameHelper(face, nid,
--                     TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
-+                     TT_PLATFORM_MICROSOFT, -1, &name) ||
-        getNameHelper(face, nid,
-                      TT_PLATFORM_APPLE_UNICODE, -1, &name)) {
-         string = malloc(name.string_len / 2 + 1);

xorg-x11-font-utils.spec

@@ -4,38 +4,27 @@ Summary:    X.Org X11 font utilities
 Name:       xorg-x11-font-utils
 Epoch:      1
 Version:    7.5
-Release:    45
+Release:    42
 License:    MIT
 URL:        http://www.x.org
 
 Source0:    http://www.x.org/pub/individual/app/bdftopcf-1.1.tar.bz2
-Source1:    http://www.x.org/pub/individual/app/fonttosfnt-1.1.0.tar.bz2
+Source1:    http://www.x.org/pub/individual/app/fonttosfnt-1.0.5.tar.bz2
 Source2:    http://www.x.org/pub/individual/app/mkfontdir-1.0.7.tar.bz2
 Source3:    http://www.x.org/pub/individual/app/mkfontscale-1.1.3.tar.bz2
-Source4:    http://www.x.org/pub/individual/font/font-util-1.3.2.tar.bz2
+Source4:    http://www.x.org/pub/individual/font/font-util-1.3.1.tar.bz2
 Source5:    xorg-x11-fonts-update-dirs
 Source6:    xorg-x11-fonts-update-dirs.1
 
-Patch0:     0001-mkfontscale-examine-all-encodings.patch
+BuildRequires: libtool pkgconfig(fontenc) pkgconfig(freetype2) pkgconfig(x11) pkgconfig(xorg-macros) >= 1.8 zlib-devel
-
-BuildRequires: libtool pkgconfig(fontenc) pkgconfig(freetype2)
-BuildRequires: pkgconfig(x11) pkgconfig(xorg-macros) >= 1.8 zlib-devel
 
 Provides:   bdftopcf = 1.1
-Obsoletes:  bdftopcf < 1.1
+Provides:   fonttosfnt = 1.0.5
-Provides:   fonttosfnt = 1.1.0
-Obsoletes:  fonttosfnt < 1.1.0
 Provides:   mkfontdir = 1.0.7
-Obsoletes:  mkfontdir < 1.0.7
 Provides:   mkfontscale = 1.1.3
-Obsoletes:  mkfontscale < 1.1.3
+Provides:   font-util = 1.3.1
-Provides:   font-util = 1.3.2
-Obsoletes:  font-util < 1.3.2
 Provides:   font-utils = %{epoch}:%{version}-%{release}
-Obsoletes:  font-utils < %{epoch}:%{version}-%{release}
 Provides:   ucs2any = 1.3.1
-Obsoletes:  ucs2any < 1.3.1
-
 
 %description
 X.Org X11 font utilities required for font installation, conversion, and generation.
@@ -44,9 +33,6 @@ X.Org X11 font utilities required for font installation, conversion, and generat
 
 %prep
 %setup -q -c xorg-x11-font-utils-%{version} -a1 -a2 -a3 -a4
-pushd mkfontscale-*
-%patch0 -p1 -b .all-encodings
-popd
 
 %build
 {
@@ -111,23 +97,11 @@ find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f
 %{_mandir}/man1/xorg-x11-fonts-update-dirs.1*
 
 %changelog
-* Thu Aug 01 2024 lingsheng <lingsheng1@h-partners.com> - 1:7.5-45
+* Thu Jan 09 2020 openEuler Buildteam <buildteam@openeuler.org> - 7.5-42
-- Replace tabs with spaces, fix changelog version
-
-* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 1:7.5-44
-- rebuild for next release
-
-* Fri Jul 24 2020 chengguipeng <chengguipeng1@huawei.com> - 1:7.5-43
-- Type:enhancement
-- Id:NA
-- SUG:NA
-- DESC:Upgrade to 7.5-43
-
-* Thu Jan 09 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:7.5-42
 - Type:enhancement
 - Id:NA
 - SUG:NA
 - DESC:optimization the spec
 
-* Thu Sep 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:7.5-41
+* Thu Sep 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.5-41
 - Package init