[fontconfig/f17] Fix matching lang wrongly. (#771093)

[Akira TAGOH]

commit 329ce3492fe02a0d520a946b3b5ce4d93daf83b6
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Sep 7 12:36:54 2012 +0900

    Fix matching lang wrongly. (#771093)

 fontconfig-fix-lang-match.patch |   33 +++++++++++++++++++++++++++++++++
 fontconfig.spec                 |    7 ++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/fontconfig-fix-lang-match.patch b/fontconfig-fix-lang-match.patch
new file mode 100644
index 0000000..e3af524
--- /dev/null
+++ b/fontconfig-fix-lang-match.patch
@@ -0,0 +1,33 @@
+From 0d47cfabd82cd9c02ec5711383f06599b0450ac0 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad at behdad.org>
+Date: Tue, 7 Dec 2010 18:48:56 -0500
+Subject: [PATCH] Bug 28958 - lang=en matches other langs
+
+Patch from Akira TAGOH.
+---
+ src/fclang.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/fclang.c b/src/fclang.c
+index f3b825a..1c78328 100644
+--- a/src/fclang.c
++++ b/src/fclang.c
+@@ -505,6 +505,7 @@ FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb)
+ 
+ /*
+  * Used in computing values -- mustn't allocate any storage
++ * XXX Not thread-safe
+  */
+ FcLangSet *
+ FcLangSetPromote (const FcChar8 *lang)
+@@ -515,6 +516,7 @@ FcLangSetPromote (const FcChar8 *lang)
+     int			id;
+ 
+     memset (ls.map, '\0', sizeof (ls.map));
++    ls.map_size = NUM_LANG_SET_MAP;
+     ls.extra = 0;
+     id = FcLangSetIndex (lang);
+     if (id > 0)
+-- 
+1.7.11.4
+
diff --git a/fontconfig.spec b/fontconfig.spec
index e2091b8..17de1c2 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.8.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch1: fontconfig-2.8.0-dingbats.patch
 Patch2: fontconfig-orth-updates.patch
 Patch3: fontconfig-drop-apple-roman-support.patch
 Patch4: fontconfig-add-FcCharSetDelChar.patch
+Patch5: fontconfig-fix-lang-match.patch
 
 BuildRequires: expat-devel
 BuildRequires: freetype-devel >= %{freetype_version}
@@ -52,6 +53,7 @@ will use fontconfig.
 %patch2 -p1 -b .orth-updates
 %patch3 -p1 -b .apple-roman
 %patch4 -p1 -b .add-fccharsetdelchar
+%patch5 -p1 -b .fix-lang-match
 
 %build
 libtoolize -f
@@ -129,6 +131,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep  7 2012 Akira TAGOH <tagoh at redhat.com> - 2.8.0-8
+- Fix matching lang wrongly. (#771093)
+
 * Wed May 16 2012 Akira TAGOH <tagoh at redhat.com> - 2.8.0-7
 - Add grep and coreutils to Requires(post). (#821957)