- rel 3; some nasty, old bug fixed

Changed files:
    fontconfig-git.patch -> 1.1
    fontconfig.spec -> 1.95

diff --git a/fontconfig-git.patch b/fontconfig-git.patch
new file mode 100644 (file)
index 0000000..6f90957
--- /dev/null
+++ b/fontconfig-git.patch
@@ -0,0 +1,27 @@
+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 48d04dfc310c3df05af48c741a3d77747d1a31b0..ea4d187cce6ab6962c3ff87f39830bfde2b12d23 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -7,7 +7,7 @@ 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:       2
+Release:       3
 Epoch:         1
 License:       MIT
 Group:         Libraries
@@ -16,6 +16,7 @@ Source0:      http://fontconfig.org/release/%{name}-%{version}.tar.gz
 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
@@ -125,6 +126,7 @@ Este pacote contém a biblioteca estática do fontconfig
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}