From 1a4fcfeca3f61384c1b20e757722b5d1d6a25c7199fda8fcb8dc17e6132081ed Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 7 Apr 2010 11:16:36 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/fontconfig revision 32.0 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=0b63d34203bb5f54992ff6e0282c22c5 --- fontconfig.changes | 5 +++++ fontconfig.spec | 19 +++++-------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/fontconfig.changes b/fontconfig.changes index 37cdc2a..413834b 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 6 14:33:12 UTC 2010 - coolo@novell.com + +- disable patch that 'fixes' make check for a patched freetype2 + ------------------------------------------------------------------- Thu Feb 11 09:38:44 UTC 2010 - mxwu@novell.com diff --git a/fontconfig.spec b/fontconfig.spec index 86483a9..5016546 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -35,7 +35,7 @@ Obsoletes: fontconfig-64bit %endif Requires: bash Version: 2.8.0 -Release: 3 +Release: 4 Summary: Library for Font Configuration # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login @@ -76,12 +76,6 @@ contains two essential modules: the configuration module, which builds an internal configuration from XML files, and the matching module, which accepts font patterns and returns the nearest matching font. - - -Authors: --------- - Keith Packard - %package devel License: MIT License (or similar) Requires: %{name} = %version @@ -107,12 +101,6 @@ contains two essential modules, the configuration module which builds an internal configuration from XML files and the matching module which accepts font patterns and returns the nearest matching font. - - -Authors: --------- - Keith Packard - %prep %setup -q %if %{build_docs} < 1 @@ -120,7 +108,10 @@ Authors: %endif %patch5 -p0 -b .dynafont %patch10 -p1 -b .fonts.conf -%patch16 -p1 +#This patch 'fixes' the test suite after freetype2 patch +#As I disabled the freetype2 patch, we need to leave this out +#too for now. Let's see if we need to have it back +##%patch16 -p1 #%patch30 -p1 %patch31 -p1 %patch32 -p1