diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index 3874f4c..bad4b77 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -29,68 +29,68 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts -Version: 7.0 -Release: 4 +Version: 7.1 +Release: 1 License: Various licenses Group: User Interface/X URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source0: encodings-1.0.0.tar.bz2 -Source1: font-alias-1.0.1.tar.bz2 -Source10: font-adobe-100dpi-1.0.0.tar.bz2 -Source11: font-adobe-75dpi-1.0.0.tar.bz2 -Source12: font-adobe-utopia-100dpi-1.0.1.tar.bz2 -Source13: font-adobe-utopia-75dpi-1.0.1.tar.bz2 -Source14: font-adobe-utopia-type1-1.0.1.tar.bz2 - -Source15: font-arabic-misc-1.0.0.tar.bz2 - -Source16: font-bh-100dpi-1.0.0.tar.bz2 -Source17: font-bh-75dpi-1.0.0.tar.bz2 -Source18: font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2 -Source19: font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2 - -Source20: font-bh-ttf-1.0.0.tar.bz2 -Source21: font-bh-type1-1.0.0.tar.bz2 -Source22: font-bitstream-100dpi-1.0.0.tar.bz2 -Source23: font-bitstream-75dpi-1.0.0.tar.bz2 +Source0: ftp://ftp.freedesktop.org/pub/individual/font/encodings-1.0.0.tar.bz2 +Source1: ftp://ftp.freedesktop.org/pub/individual/font/font-alias-1.0.1.tar.bz2 +Source10: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-100dpi-1.0.0.tar.bz2 +Source11: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-75dpi-1.0.0.tar.bz2 +Source12: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2 +Source13: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2 +Source14: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-type1-1.0.1.tar.bz2 +Source15: ftp://ftp.freedesktop.org/pub/individual/font/font-arabic-misc-1.0.0.tar.bz2 +Source16: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-100dpi-1.0.0.tar.bz2 +Source17: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-75dpi-1.0.0.tar.bz2 +Source18: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2 +Source19: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2 +Source20: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2 +Source21: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2 +Source22: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-100dpi-1.0.0.tar.bz2 +Source23: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-75dpi-1.0.0.tar.bz2 # NOTE: X.Org 6.8.x and later has deprecated and disabled the speedo font # support by default, so we exclude the speedo fonts. #Source24: font-bitstream-speedo-1.0.0.tar.bz2 -Source25: font-bitstream-type1-1.0.0.tar.bz2 -Source26: font-cronyx-cyrillic-1.0.0.tar.bz2 -Source27: font-cursor-misc-1.0.0.tar.bz2 -Source28: font-daewoo-misc-1.0.0.tar.bz2 -Source29: font-dec-misc-1.0.0.tar.bz2 -Source30: font-ibm-type1-1.0.0.tar.bz2 -Source31: font-isas-misc-1.0.0.tar.bz2 -Source32: font-jis-misc-1.0.0.tar.bz2 -Source33: font-micro-misc-1.0.0.tar.bz2 -Source34: font-misc-cyrillic-1.0.0.tar.bz2 +Source25: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-type1-1.0.0.tar.bz2 +Source26: ftp://ftp.freedesktop.org/pub/individual/font/font-cronyx-cyrillic-1.0.0.tar.bz2 +Source27: ftp://ftp.freedesktop.org/pub/individual/font/font-cursor-misc-1.0.0.tar.bz2 +Source28: ftp://ftp.freedesktop.org/pub/individual/font/font-daewoo-misc-1.0.0.tar.bz2 +Source29: ftp://ftp.freedesktop.org/pub/individual/font/font-dec-misc-1.0.0.tar.bz2 +Source30: ftp://ftp.freedesktop.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2 +Source31: ftp://ftp.freedesktop.org/pub/individual/font/font-isas-misc-1.0.0.tar.bz2 +Source32: ftp://ftp.freedesktop.org/pub/individual/font/font-jis-misc-1.0.0.tar.bz2 +Source33: ftp://ftp.freedesktop.org/pub/individual/font/font-micro-misc-1.0.0.tar.bz2 +Source34: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-cyrillic-1.0.0.tar.bz2 %if %{with_ethiopic_fonts} -Source35: font-misc-ethiopic-1.0.0.tar.bz2 +Source35: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-ethiopic-1.0.0.tar.bz2 %endif -Source36: font-misc-meltho-1.0.0.tar.bz2 -Source37: font-misc-misc-1.0.0.tar.bz2 -Source38: font-mutt-misc-1.0.0.tar.bz2 -Source39: font-schumacher-misc-1.0.0.tar.bz2 -Source40: font-screen-cyrillic-1.0.0.tar.bz2 -Source41: font-sony-misc-1.0.0.tar.bz2 -Source42: font-sun-misc-1.0.0.tar.bz2 -Source43: font-winitzki-cyrillic-1.0.0.tar.bz2 -Source44: font-xfree86-type1-1.0.0.tar.bz2 +Source36: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2 +Source37: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-misc-1.0.0.tar.bz2 +Source38: ftp://ftp.freedesktop.org/pub/individual/font/font-mutt-misc-1.0.0.tar.bz2 +Source39: ftp://ftp.freedesktop.org/pub/individual/font/font-schumacher-misc-1.0.0.tar.bz2 +Source40: ftp://ftp.freedesktop.org/pub/individual/font/font-screen-cyrillic-1.0.0.tar.bz2 +Source41: ftp://ftp.freedesktop.org/pub/individual/font/font-sony-misc-1.0.0.tar.bz2 +Source42: ftp://ftp.freedesktop.org/pub/individual/font/font-sun-misc-1.0.0.tar.bz2 +Source43: ftp://ftp.freedesktop.org/pub/individual/font/font-winitzki-cyrillic-1.0.0.tar.bz2 +Source44: ftp://ftp.freedesktop.org/pub/individual/font/font-xfree86-type1-1.0.0.tar.bz2 Patch0: font-alias-1.0.0-fonts-alias-fontdir-fix.patch Patch1: encodings-1.0.0-encodings-fontdir-fix.patch +# FIXME: Temporary requirement on autoconf for a workaround. +BuildRequires: autoconf + BuildRequires: pkgconfig 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 +BuildRequires: font-utils >= 1.0.2-1 # 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 @@ -1534,6 +1534,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Wed Jun 21 2006 Mike A. Harris 7.1-1 +- Added "BuildRequires: autoconf" temporary dependency. + * Fri May 26 2006 Mike A. Harris 7.0-4 - Added "BuildRequires: fontconfig" for (#192038)