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,2 +1,3 @@
 fontconfig-2.8.0.tar.gz
 /fontconfig-2.9.0.tar.gz
+/fontconfig-2.9.91.tar.bz2

fontconfig-2.9.0-result.patch

@@ -1,75 +0,0 @@
-From 92ac054ce5e270f22a4f81a09522c3f03b76c876 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 22 Mar 2012 19:15:27 +0900
-Subject: [PATCH] fcmatch: Set FcResultMatch at the end if the return value is
- valid.
-
-In the previous code, the result of 'result' in the argument for
-FcFontSetSort() and FcFontSetMatch() wasn't predictable and not reliable to
-check if the return value is valid or not. this change is to ensure if it's
-performed successfully.
----
- src/fcmatch.c |   19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/src/fcmatch.c b/src/fcmatch.c
-index 422bc38..92e4a66 100644
---- a/src/fcmatch.c
-+++ b/src/fcmatch.c
-@@ -501,11 +501,11 @@ FcFontSetMatchInternal (FcConfig    *config,
- 	printf ("\n");
- 	FcPatternPrint (best);
-     }
--    if (!best)
--    {
--	*result = FcResultNoMatch;
--	return 0;
--    }
-+    /* assuming that 'result' is initialized with FcResultNoMatch
-+     * outside this function */
-+    if (best)
-+	*result = FcResultMatch;
-+
-     return best;
- }
- 
-@@ -522,6 +522,8 @@ FcFontSetMatch (FcConfig    *config,
-     assert (p != NULL);
-     assert (result != NULL);
- 
-+    *result = FcResultNoMatch;
-+
-     if (!config)
-     {
- 	config = FcConfigGetCurrent ();
-@@ -547,6 +549,8 @@ FcFontMatch (FcConfig	*config,
-     assert (p != NULL);
-     assert (result != NULL);
- 
-+    *result = FcResultNoMatch;
-+
-     if (!config)
-     {
- 	config = FcConfigGetCurrent ();
-@@ -826,6 +830,9 @@ FcFontSetSort (FcConfig	    *config,
- 	printf ("First font ");
- 	FcPatternPrint (ret->fonts[0]);
-     }
-+    if (ret->nfont > 0)
-+	*result = FcResultMatch;
-+
-     return ret;
- 
- bail2:
-@@ -849,6 +856,8 @@ FcFontSort (FcConfig	*config,
-     assert (p != NULL);
-     assert (result != NULL);
- 
-+    *result = FcResultNoMatch;
-+
-     if (!config)
-     {
- 	config = FcConfigGetCurrent ();
--- 
-1.7.7.6
-

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@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@redhat.com> - 2.9.0-2
 - Add grep and coreutils to Requires(post). (#821957)
 

sources

@@ -1 +1 @@
-26c83855ed256b5c032baae032fadc4f  fontconfig-2.9.0.tar.gz
+d4a3edd8e2ec4778c73b7923ae1f45b3  fontconfig-2.9.91.tar.bz2