From a7497ae70c904377737bdcb2a039f78d029bd406 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 19 Nov 2005 22:03:46 +0000 Subject: [PATCH] cvs snapshot --- .cvsignore | 1 + fontconfig.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0cfa786..5ade90e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ fontconfig-2.3.2.tar.gz fontconfig-2.3.91.cvs20051017.tar.gz fontconfig-2.3.91.cvs20051031.tar.gz fontconfig-2.3.92.tar.gz +fontconfig-2.3.92.cvs20051119.tar.gz diff --git a/fontconfig.spec b/fontconfig.spec index a8baafd..2e31d69 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -2,8 +2,8 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.3.92 -Release: 3 +Version: 2.3.92.cvs20051119 +Release: 1 License: MIT Group: System Environment/Libraries Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz @@ -14,6 +14,7 @@ Source2: 50-no-hint-fonts.conf Patch1: fontconfig-2.3.91-defaultconfig.patch Patch2: fontconfig-2.3.91-crosscheck.patch +Patch3: fontconfig-2.3.92-ft-internals.patch BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: expat-devel @@ -51,9 +52,11 @@ will use fontconfig. %patch1 -p1 -b .defaultconfig %patch2 -p1 -b .crosscheck +%patch3 -p1 -b .ft-internals %build - +# Patch3 patches src/Makefile.am +automake %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF # Work around weird elinks bug where elinks refuses to open the @@ -131,6 +134,10 @@ fi %{_mandir}/man3/* %changelog +* Sat Nov 19 2005 Matthias Clasen - 2.3.92.cvs20051119-1 +- Update to a newer cvs snapshot +- Don't use freetype internals + * Wed Nov 16 2005 Bill Nottingham - 2.3.93-3 - modular X moved fonts from /usr/X11R6/lib/X11/fonts to /usr/share/X11/fonts, adjust %%configure accordingly and diff --git a/sources b/sources index 32f6c04..37636b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf03f8e2a8b5e63fe54f1c6f5cb39b17 fontconfig-2.3.92.tar.gz +8735347fafb5b47c45493d72342e60fb fontconfig-2.3.92.cvs20051119.tar.gz