diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index 9489784..3874f4c 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -30,7 +30,7 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts Version: 7.0 -Release: 3 +Release: 4 License: Various licenses Group: User Interface/X URL: http://www.x.org @@ -91,6 +91,12 @@ BuildRequires: xorg-x11-util-macros # The font-utils dep here is to ensure we have a fontutil.pc file which # defines the 'fontdir' variable. BuildRequires: font-utils >= 1.0.0 +# FIXME: fontconfig is needed only because the upstream Makefiles invoke +# fc-cache at build time. This is totally useless, because we do not ship +# any of the resulting cache files, we generate them at install time from the +# rpm scripts. However, it is easier to depend on fontconfig here than it is +# to patch all 40+ tarballs to stop running fc-cache. +BuildRequires: fontconfig BuildRequires: ucs2any, bdftruncate, bdftopcf # FIXME: perl is used for now to avoid having to maintain a big patch. @@ -1528,6 +1534,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Fri May 26 2006 Mike A. Harris 7.0-4 +- Added "BuildRequires: fontconfig" for (#192038) + * Sat Mar 04 2006 Mike A. Harris 7.0-3 - Ensure upgrade-only section of fonts-base rpm post script only executes on upgrades using -gt instead of -ge.