From af6c4c6111cbb7df9f4962fdb34e332010801159264142f35f64c6db071d9d7b Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 9 Sep 2010 13:13:32 +0000
Subject: [PATCH] Updating link to change in openSUSE:Factory/fontconfig
 revision 36.0

OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=70cc3450ff4f66371b06730b4299e184
---
 10-lcdfilter-lcddefault.conf  |  9 +++++++
 fontconfig.changes            | 15 ++++++++++++
 fontconfig.spec               |  7 +++++-
 urw-aliases-whitespaces.patch | 44 +++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 10-lcdfilter-lcddefault.conf
 create mode 100644 urw-aliases-whitespaces.patch

diff --git a/10-lcdfilter-lcddefault.conf b/10-lcdfilter-lcddefault.conf
new file mode 100644
index 0000000..ebec6df
--- /dev/null
+++ b/10-lcdfilter-lcddefault.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <match target="font">
+        <edit mode="assign" name="lcdfilter">
+            <const>lcddefault</const>
+        </edit>
+    </match>
+</fontconfig>
diff --git a/fontconfig.changes b/fontconfig.changes
index 91627d8..3774791 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Aug 31 14:29:08 CEST 2010 - pgajdos@suse.cz
+
+- add AvantGarde, NewCenturySchoolbook, ZapfChancery and
+  ZapfDingbats aliases into 30-urw-aliases.conf as 
+  workaround to [bnc#434676]
+  --> added urw-aliases-whitespaces.patch
+- see http://bugs.freedesktop.org/show_bug.cgi?id=19128
+
+-------------------------------------------------------------------
+Fri Jul 23 08:39:25 UTC 2010 - mxwu@novell.com
+
+- add 10-lcdfilter-lcddefault.conf.
+  * enable lcdfilter.
+
 -------------------------------------------------------------------
 Fri Jun  4 11:51:55 UTC 2010 - coolo@novell.com
 
diff --git a/fontconfig.spec b/fontconfig.spec
index deffa95..278c27e 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -35,7 +35,7 @@ Obsoletes:      fontconfig-64bit
 %endif
 Requires:       bash
 Version:        2.8.0
-Release:        5
+Release:        10
 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
@@ -59,6 +59,7 @@ Source14:       suse-bitmaps.conf
 Source15:       suse-font-dirs.conf
 Source20:       local.conf.instsys
 Source30:       29-liberation-aliases.conf
+Source31:       10-lcdfilter-lcddefault.conf
 # http://www.kde.gr.jp/~akito/patch/
 # http://www.kde.gr.jp/~akito/patch/fontconfig/fontconfig-2.2.1/fontconfig-2.2.1-AppleRoman-DynaFont.patch
 Patch5:         AppleRoman-DynaFont.patch
@@ -68,6 +69,7 @@ Patch30:        bugzilla-179457-fix-font-file-names-for-wine.patch
 Patch31:        bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch
 Patch32:        usr-share-doc-packages.patch
 Patch33:        bnc438855-make-FcInitReinitialize-work-again.patch
+Patch34:        urw-aliases-whitespaces.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -113,6 +115,7 @@ accepts font patterns and returns the nearest matching font.
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 %build
 %configure --with-pic  \
@@ -162,10 +165,12 @@ install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d
 install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/
 install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/
 install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail
+install -m 644 $RPM_SOURCE_DIR/10-lcdfilter-lcddefault.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail
 # tune links in conf.d:
 pushd $RPM_BUILD_ROOT/etc/fonts/conf.d
     ln -s ../suse-font-dirs.conf 05-suse-font-dirs.conf
     ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf 
+    ln -s ../conf.avail/10-lcdfilter-lcddefault.conf 10-lcdfilter-lcddefault.conf
     rm -f 50-user.conf
     rm -f 51-local.conf
     ln -s ../suse-pre-user.conf 50-suse-pre-user.conf
diff --git a/urw-aliases-whitespaces.patch b/urw-aliases-whitespaces.patch
new file mode 100644
index 0000000..81fdc6a
--- /dev/null
+++ b/urw-aliases-whitespaces.patch
@@ -0,0 +1,44 @@
+Index: fontconfig-2.8.0/conf.d/30-urw-aliases.conf
+===================================================================
+--- fontconfig-2.8.0.orig/conf.d/30-urw-aliases.conf
++++ fontconfig-2.8.0/conf.d/30-urw-aliases.conf
+@@ -9,6 +9,10 @@
+ 	  <family>Avant Garde</family>
+ 	  <accept><family>URW Gothic L</family></accept>
+ 	</alias>
++        <alias binding="same">
++          <family>AvantGarde</family>
++          <accept><family>URW Gothic L</family></accept>
++        </alias>
+ 	<alias binding="same">
+ 	  <family>Bookman</family>
+ 	  <accept><family>URW Bookman L</family></accept>
+@@ -17,6 +21,10 @@
+ 	  <family>New Century Schoolbook</family>
+ 	  <accept><family>Century Schoolbook L</family></accept>
+ 	</alias>
++        <alias binding="same">
++          <family>NewCenturySchoolbook</family>
++          <accept><family>Century Schoolbook L</family></accept>
++        </alias>
+ 	<alias binding="same">
+ 	  <family>Palatino</family>
+ 	  <accept><family>URW Palladio L</family></accept>
+@@ -26,9 +34,17 @@
+ 	  <accept><family>URW Chancery L</family></accept>
+ 	</alias>
+ 	<alias binding="same">
++	  <family>ZapfChancery</family>
++	  <accept><family>URW Chancery L</family></accept>
++	</alias>
++	<alias binding="same">
+ 	  <family>Zapf Dingbats</family>
+ 	  <accept><family>Dingbats</family></accept>
+ 	</alias>
++	<alias binding="same">
++	  <family>ZapfDingbats</family>
++	  <accept><family>Dingbats</family></accept>
++	</alias>
+ 	<match target="pattern">
+ 	  <test name="family">
+ 	    <string>Symbol</string>