BuildRequire mkfontscale now that it's separated out from

xorg-x11-font-utils (#1938069)

Use the make_build rpm macro
This commit is contained in:
Peter Hutterer 2021-03-12 15:12:07 +10:00
parent 9d77ebd0cb
commit b2e2d961c5

View File

@ -5,7 +5,7 @@
Summary: X.Org X11 fonts
Name: xorg-x11-fonts
Version: 7.5
Release: 28%{?dist}
Release: 29%{?dist}
License: MIT and Lucida and Public Domain
URL: https://www.x.org
@ -56,7 +56,7 @@ Source31: https://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.b
# http://www.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
BuildRequires: make
BuildRequires: bdftopcf
BuildRequires: bdftopcf mkfontscale
BuildRequires: font-util >= 1.1.0
BuildRequires: pkgconfig(xorg-macros) >= 1.3
BuildRequires: ucs2any
@ -243,7 +243,7 @@ Contains a set of Cyrillic fonts.
%configure --with-fontrootdir=%{_x11fontdir}
;;
esac
make %{?_smp_mflags}
%make_build
popd
done
}
@ -931,6 +931,11 @@ mkfontdir %{_x11fontdir}/cyrillic || :
%ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
%changelog
* Fri Mar 12 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.5-29
- BuildRequire mkfontscale now that it's separated out from
xorg-x11-font-utils (#1938069)
- Use the make_build rpm macro
* Mon Feb 22 2021 Adam Williamson <awilliam@redhat.com> - 7.5-28
- Make scriptlets non-failable (#1926533)