From 3437228fedefaed682a2ac6c0bd049af37533a621659137f880296ac824537b1 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Tue, 31 Aug 2010 13:10:09 +0000
Subject: [PATCH] - 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

OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=21
---
 fontconfig.changes            |  9 +++++++
 fontconfig.spec               |  2 ++
 urw-aliases-whitespaces.patch | 44 +++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 urw-aliases-whitespaces.patch

diff --git a/fontconfig.changes b/fontconfig.changes
index 0d2773a..3774791 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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
 
diff --git a/fontconfig.spec b/fontconfig.spec
index bd5684b..f727170 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -69,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
@@ -114,6 +115,7 @@ accepts font patterns and returns the nearest matching font.
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 %build
 %configure --with-pic  \
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>