From c0e648a3f92303f71cf3075098c328fb7ed7e959813212f9cb26df8a164e2e91 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 11 Feb 2010 09:01:23 +0000 Subject: [PATCH 1/6] Accepting request 32159 from home:Mingxi_Wu:branches:M17N Copy from home:Mingxi_Wu:branches:M17N/fontconfig via accept of submit request 32159 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/32159 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=12 --- suse-post-user.conf | 3 +++ 1 file changed, 3 insertions(+) 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 From ba5db37e77819435b4d74e464ffd9bdab515fa871e2c9c81afadc0c0f405aa24 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 11 Feb 2010 09:58:53 +0000 Subject: [PATCH 2/6] Accepting request 32169 from home:Mingxi_Wu:branches:M17N Copy from home:Mingxi_Wu:branches:M17N/fontconfig via accept of submit request 32169 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/32169 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=13 --- fontconfig.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fontconfig.changes b/fontconfig.changes index 8125e61..37cdc2a 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 From caa97697b335f7838e9ae1be86a303cfd222b169b739d87e76108ede4267ad4e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 24 Feb 2010 01:04:43 +0000 Subject: [PATCH 3/6] Accepting request 33078 from M17N checked in (request 33078) OBS-URL: https://build.opensuse.org/request/show/33078 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=15 --- fontconfig.changes | 5 ----- suse-post-user.conf | 3 --- 2 files changed, 8 deletions(-) diff --git a/fontconfig.changes b/fontconfig.changes index 37cdc2a..8125e61 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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/suse-post-user.conf b/suse-post-user.conf index cde9b92..23f16f7 100644 --- a/suse-post-user.conf +++ b/suse-post-user.conf @@ -40,7 +40,6 @@ Kochi Mincho CMEXSong FZSongTi - WenQuanYi WenQuanYi Bitmap Song WenQuanYi Zen Hei AR PL ShanHeiSun Uni FZMingTiB @@ -90,7 +89,6 @@ Kochi Gothic CMEXSong FZSongTi - WenQuanYi WenQuanYi Bitmap Song WenQuanYi Zen Hei AR PL ShanHeiSun Uni FZMingTiB @@ -133,7 +131,6 @@ Kochi Gothic CMEXSong FZSongTi - WenQuanYi WenQuanYi Bitmap Song WenQuanYi Zen Hei Mono AR PL ShanHeiSun Uni FZMingTiB From 0bc4a64a3af4fadefb489fbec23f57ba0df6fd77cce3df66ec2d174e5fd3701e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 6 Apr 2010 14:33:40 +0000 Subject: [PATCH 4/6] - disable patch that 'fixes' make check for a patched freetype2 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=16 --- fontconfig.changes | 10 ++++++++++ fontconfig.spec | 21 ++++++--------------- ready | 0 suse-post-user.conf | 3 +++ 4 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 ready 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 From c68918e41536f3c27fbac7893c1a1d1ce22c0ba464a9e485a412e0e13cbd9509 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 7 Apr 2010 11:16:35 +0000 Subject: [PATCH 5/6] Accepting request 37095 from M17N checked in (request 37095) OBS-URL: https://build.opensuse.org/request/show/37095 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=17 --- fontconfig.changes | 5 ----- fontconfig.spec | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/fontconfig.changes b/fontconfig.changes index 413834b..37cdc2a 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 84d583b..86483a9 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -76,6 +76,12 @@ 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 @@ -101,6 +107,12 @@ 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 @@ -108,10 +120,7 @@ accepts font patterns and returns the nearest matching font. %endif %patch5 -p0 -b .dynafont %patch10 -p1 -b .fonts.conf -#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 +%patch16 -p1 #%patch30 -p1 %patch31 -p1 %patch32 -p1 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 6/6] 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