[fontconfig] New upstream release.

[Akira TAGOH]

commit 2a8b7bf64a72877668ff076f411fc330b645f6a0
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Jun 11 21:03:28 2012 +0900

    New upstream release.
    
      - docs are generated with the fixed docbook (#826145)
      - handle whitespace in family name correctly (#468565, #591634)
      - Updated ne.orth. (#586763)

 .gitignore                    |    1 +
 fontconfig-2.9.0-result.patch |   75 -----------------------------------------
 fontconfig.spec               |   21 ++++++-----
 sources                       |    2 +-
 4 files changed, 14 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7800f7..ecd9e87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 fontconfig-2.8.0.tar.gz
 /fontconfig-2.9.0.tar.gz
+/fontconfig-2.9.91.tar.bz2
diff --git a/fontconfig.spec b/fontconfig.spec
index 324e920..01952f5 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,16 +2,15 @@
 
 Summary:	Font configuration and customization library
 Name:		fontconfig
-Version:	2.9.0
-Release:	2%{?dist}
+Version:	2.9.91
+Release:	1%{?dist}
 License:	MIT
 Group:		System Environment/Libraries
-Source:		http://fontconfig.org/release/fontconfig-%{version}.tar.gz
+Source:		http://fontconfig.org/release/fontconfig-%{version}.tar.bz2
 URL:		http://fontconfig.org
 Source1:	25-no-bitmap-fedora.conf
 
 Patch0:		fontconfig-2.8.0-sleep-less.patch
-Patch1:		fontconfig-2.9.0-result.patch
 
 BuildRequires:	expat-devel
 BuildRequires:	freetype-devel >= %{freetype_version}
@@ -44,7 +43,6 @@ will use fontconfig.
 %prep
 %setup -q
 %patch0 -p1 -b .sleep-less
-%patch1 -p1 -b .result
 
 %build
 # update autotools stuff to avoid rpath definition.
@@ -65,7 +63,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-ln -s ../conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/
+ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/
 
 # move installed doc files back to build directory to package themm
 # in the right place
@@ -105,10 +103,9 @@ fi
 %{_bindir}/fc-pattern
 %{_bindir}/fc-query
 %{_bindir}/fc-scan
-%dir %{_fontconfig_masterdir}/conf.avail
-%{_fontconfig_masterdir}/fonts.dtd
+%{_fontconfig_templatedir}/*.conf
+%{_datadir}/xml/fontconfig/fonts.dtd
 %config %{_fontconfig_masterdir}/fonts.conf
-%config %{_fontconfig_masterdir}/conf.avail/*.conf
 %config(noreplace) %{_fontconfig_confdir}/*.conf
 %dir %{_localstatedir}/cache/fontconfig
 
@@ -124,6 +121,12 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jun 11 2012 Akira TAGOH <tagoh at redhat.com> - 2.9.91-1
+- New upstream release.
+  - docs are generated with the fixed docbook (#826145)
+  - handle whitespace in family name correctly (#468565, #591634)
+  - Updated ne.orth. (#586763)
+
 * Wed May 16 2012 Akira TAGOH <tagoh at redhat.com> - 2.9.0-2
 - Add grep and coreutils to Requires(post). (#821957)
 
diff --git a/sources b/sources
index 0909ee9..a7de344 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26c83855ed256b5c032baae032fadc4f  fontconfig-2.9.0.tar.gz
+d4a3edd8e2ec4778c73b7923ae1f45b3  fontconfig-2.9.91.tar.bz2