Accepting request 37095 from M17N

Copy from M17N/fontconfig based on submit request 37095 from user coolo

OBS-URL: https://build.opensuse.org/request/show/37095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=32
This commit is contained in:
OBS User autobuild 2010-04-07 11:16:36 +00:00 committed by Git OBS Bridge
commit 7f6884a885
2 changed files with 10 additions and 14 deletions

View File

@ -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 Thu Feb 11 09:38:44 UTC 2010 - mxwu@novell.com

View File

@ -35,7 +35,7 @@ Obsoletes: fontconfig-64bit
%endif %endif
Requires: bash Requires: bash
Version: 2.8.0 Version: 2.8.0
Release: 3 Release: 4
Summary: Library for Font Configuration Summary: Library for Font Configuration
# CVS can be found here: (CVS is gone, fontconfig uses git now). # CVS can be found here: (CVS is gone, fontconfig uses git now).
# $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login # $ 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, an internal configuration from XML files, and the matching module,
which accepts font patterns and returns the nearest matching font. which accepts font patterns and returns the nearest matching font.
Authors:
--------
Keith Packard <keithp@keithp.com>
%package devel %package devel
License: MIT License (or similar) License: MIT License (or similar)
Requires: %{name} = %version 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 an internal configuration from XML files and the matching module which
accepts font patterns and returns the nearest matching font. accepts font patterns and returns the nearest matching font.
Authors:
--------
Keith Packard <keithp@keithp.com>
%prep %prep
%setup -q %setup -q
%if %{build_docs} < 1 %if %{build_docs} < 1
@ -120,7 +108,10 @@ Authors:
%endif %endif
%patch5 -p0 -b .dynafont %patch5 -p0 -b .dynafont
%patch10 -p1 -b .fonts.conf %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 #%patch30 -p1
%patch31 -p1 %patch31 -p1
%patch32 -p1 %patch32 -p1