[fontconfig] paper over 468565

[Adam Jackson]

commit eca3a891b8f76cdc4a771a626b0badf4ecb2fe0d
Author: Adam Jackson <ajax(a)redhat.com&gt;
Date:   Tue May 31 16:02:29 2011 -0400

    paper over 468565

 fontconfig-2.8.0-dingbats.patch |   16 ++++++++++++++++
 fontconfig.spec                 |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/fontconfig-2.8.0-dingbats.patch b/fontconfig-2.8.0-dingbats.patch
new file mode 100644
index 0000000..191afcc
--- /dev/null
+++ b/fontconfig-2.8.0-dingbats.patch
@@ -0,0 +1,16 @@
+Super lame.  Drop me once fontconfig learns how to ignore spaces.
+
+diff -up fontconfig-2.8.0/conf.d/30-urw-aliases.conf.jx
fontconfig-2.8.0/conf.d/30-urw-aliases.conf
+--- fontconfig-2.8.0/conf.d/30-urw-aliases.conf.jx	2009-11-16 12:24:52.000000000 -0500
++++ fontconfig-2.8.0/conf.d/30-urw-aliases.conf	2011-05-31 16:00:06.162549910 -0400
+@@ -29,6 +29,10 @@
+ 	  <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>
diff --git a/fontconfig.spec b/fontconfig.spec
index 215af99..763844b 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source1: 25-no-bitmap-fedora.conf
 
 Patch0: fontconfig-2.8.0-sleep-less.patch
+Patch1: fontconfig-2.8.0-dingbats.patch
 
 BuildRequires: gawk
 BuildRequires: expat-devel
@@ -47,6 +48,7 @@ will use fontconfig.
 %prep
 %setup -q
 %patch0 -p1 -b .sleep-less
+%patch1 -p1 -b .dingbats
 
 %build
 
@@ -131,6 +133,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Tue May 31 2011 Adam Jackson <ajax(a)redhat.com&gt; 2.8.0-4
+- fontconfig-2.8.0-dingbats.patch: Hack for dingbats font matching. (#468565)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
2.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild