diff --git a/mkfontscale-examine-all-encodings.patch b/mkfontscale-examine-all-encodings.patch deleted file mode 100644 index 1913915..0000000 --- a/mkfontscale-examine-all-encodings.patch +++ /dev/null @@ -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); diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index 2cc6804..7effa3d 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 font utilities Name: xorg-x11-font-utils Epoch: 1 Version: 7.5 -Release: 41 +Release: 42 License: MIT URL: http://www.x.org @@ -16,8 +16,6 @@ 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: mkfontscale-examine-all-encodings.patch - BuildRequires: libtool pkgconfig(fontenc) pkgconfig(freetype2) pkgconfig(x11) pkgconfig(xorg-macros) >= 1.8 zlib-devel Provides: bdftopcf = 1.1 @@ -35,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 { @@ -102,5 +97,11 @@ find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f %{_mandir}/man1/xorg-x11-fonts-update-dirs.1* %changelog +* Thu Jan 09 2020 openEuler Buildteam - 7.5-42 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:optimization the spec + * Thu Sep 12 2019 openEuler Buildteam - 7.5-41 - Package init