diff --git a/fontconfig.changes b/fontconfig.changes index 8125e61..413834b 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 + +- Add support for WenQuanYi Bitmap Song. + ------------------------------------------------------------------- Mon Dec 14 20:22:32 CET 2009 - jengelh@medozas.de diff --git a/fontconfig.spec b/fontconfig.spec index 3b40c3e..84d583b 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -1,7 +1,7 @@ # # spec file for package fontconfig (Version 2.8.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,7 @@ Obsoletes: fontconfig-64bit %endif Requires: bash Version: 2.8.0 -Release: 2 +Release: 3 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 diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/suse-post-user.conf b/suse-post-user.conf index 23f16f7..cde9b92 100644 --- a/suse-post-user.conf +++ b/suse-post-user.conf @@ -40,6 +40,7 @@ Kochi Mincho CMEXSong FZSongTi + WenQuanYi WenQuanYi Bitmap Song WenQuanYi Zen Hei AR PL ShanHeiSun Uni FZMingTiB @@ -89,6 +90,7 @@ Kochi Gothic CMEXSong FZSongTi + WenQuanYi WenQuanYi Bitmap Song WenQuanYi Zen Hei AR PL ShanHeiSun Uni FZMingTiB @@ -131,6 +133,7 @@ Kochi Gothic CMEXSong FZSongTi + WenQuanYi WenQuanYi Bitmap Song WenQuanYi Zen Hei Mono AR PL ShanHeiSun Uni FZMingTiB