From f8375c1dd723d94ebdf2e3bd6bbd4c9a9fae0b5f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Wed, 21 Mar 2012 07:18:55 +0000
Subject: [PATCH] - up to 2.9.0

Changed files:
    fontconfig-git.patch -> 1.2
    fontconfig.spec -> 1.96
---
 fontconfig-git.patch | 27 ---------------------------
 fontconfig.spec      |  9 ++++-----
 2 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 fontconfig-git.patch

diff --git a/fontconfig-git.patch b/fontconfig-git.patch
deleted file mode 100644
index 6f90957..0000000
--- a/fontconfig-git.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit bf3bfa72d91e8bc37903d7e1bb7ac23c6ef4952a
-Author: Behdad Esfahbod <behdad@behdad.org>
-Date:   Wed Jun 22 13:06:19 2011 -0400
-
-    Fix stupid bug in FcFontSort()
-    
-    I broke FcFontSort() language handling at the end of 2008 with this
-    commit: c7641f28
-    
-    G-d knows how many of the lang-matching bugs in bugzilla will be
-    fixed by this changed...
-    
-    I'm really sorry, everyone!
-
-diff --git a/src/fcmatch.c b/src/fcmatch.c
-index f111be5..1b9162b 100644
---- a/src/fcmatch.c
-+++ b/src/fcmatch.c
-@@ -749,7 +749,7 @@ FcFontSetSort (FcConfig	    *config,
- 	 * If this node matches any language, go check
- 	 * which ones and satisfy those entries
- 	 */
--	if (nodeps[f]->score[MATCH_LANG_INDEX] < 200)
-+	if (nodeps[f]->score[MATCH_LANG_INDEX] < 2000)
- 	{
- 	    for (i = 0; i < nPatternLang; i++)
- 	    {
diff --git a/fontconfig.spec b/fontconfig.spec
index ea4d187..6c60da5 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -6,17 +6,16 @@ Summary:	Font configuration and customization tools
 Summary(pl.UTF-8):	Narzędzia do konfigurowania fontów
 Summary(pt_BR.UTF-8):	Ferramentas para configuração e customização do acesso a fontes
 Name:		fontconfig
-Version:	2.8.0
-Release:	3
+Version:	2.9.0
+Release:	1
 Epoch:		1
 License:	MIT
 Group:		Libraries
 Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	77e15a92006ddc2adbb06f840d591c0e
+# Source0-md5:	26c83855ed256b5c032baae032fadc4f
 Source1:	%{name}-lcd-filter.conf
 Patch0:		%{name}-blacklist.patch
 Patch1:		%{name}-bitstream-cyberbit.patch
-Patch2:		%{name}-git.patch
 URL:		http://fontconfig.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -126,7 +125,6 @@ Este pacote contém a biblioteca estática do fontconfig
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -178,6 +176,7 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %attr(755,root,root) %{_bindir}/fc-list
 %attr(755,root,root) %{_bindir}/fc-match
 %attr(755,root,root) %{_bindir}/fc-query
+%attr(755,root,root) %{_bindir}/fc-pattern
 %attr(755,root,root) %{_bindir}/fc-scan
 %{_mandir}/man1/fc-*.1*
 %{_mandir}/man5/fonts-conf.5*
-- 
2.44.0