commit fcff99ea73659764dd2575ff4118aff07f5d1c0c Author: Parag Nemade pnemade@redhat.com Date: Thu Jul 5 15:16:45 2012 +0530
Resolves:rh#837520 - Malformed fontconfig config file
65-0-khmeros-base.conf | 9 +++------ 65-0-khmeros-battambang.conf | 3 +-- 65-0-khmeros-bokor.conf | 3 +-- 65-0-khmeros-handwritten.conf | 6 ++---- 65-0-khmeros-metal-chrieng.conf | 3 +-- 65-0-khmeros-muol.conf | 9 +++------ 65-0-khmeros-siemreap.conf | 3 +-- khmeros-fonts.spec | 5 ++++- 8 files changed, 16 insertions(+), 25 deletions(-) --- diff --git a/65-0-khmeros-base.conf b/65-0-khmeros-base.conf index d6136de..3302f4a 100644 --- a/65-0-khmeros-base.conf +++ b/65-0-khmeros-base.conf @@ -23,8 +23,7 @@
<!-- Locale-specific overrides --> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> @@ -35,8 +34,7 @@ </edit> </match> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> @@ -47,8 +45,7 @@ </edit> </match> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> diff --git a/65-0-khmeros-battambang.conf b/65-0-khmeros-battambang.conf index ec5196f..39f2af2 100644 --- a/65-0-khmeros-battambang.conf +++ b/65-0-khmeros-battambang.conf @@ -10,8 +10,7 @@ </alias> <!-- Locale-specific overrides --> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> diff --git a/65-0-khmeros-bokor.conf b/65-0-khmeros-bokor.conf index c4a0679..40db741 100644 --- a/65-0-khmeros-bokor.conf +++ b/65-0-khmeros-bokor.conf @@ -10,8 +10,7 @@ </alias> <!-- Locale-specific overrides --> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> diff --git a/65-0-khmeros-handwritten.conf b/65-0-khmeros-handwritten.conf index 7473d67..8902847 100644 --- a/65-0-khmeros-handwritten.conf +++ b/65-0-khmeros-handwritten.conf @@ -16,8 +16,7 @@ </alias> <!-- Locale-specific overrides --> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> @@ -28,8 +27,7 @@ </edit> </match> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> diff --git a/65-0-khmeros-metal-chrieng.conf b/65-0-khmeros-metal-chrieng.conf index 11cef34..fde6943 100644 --- a/65-0-khmeros-metal-chrieng.conf +++ b/65-0-khmeros-metal-chrieng.conf @@ -10,8 +10,7 @@ </alias> <!-- Locale-specific overrides --> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> diff --git a/65-0-khmeros-muol.conf b/65-0-khmeros-muol.conf index bcd33b3..2448b23 100644 --- a/65-0-khmeros-muol.conf +++ b/65-0-khmeros-muol.conf @@ -23,8 +23,7 @@
<!-- Locale-specific overrides --> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> @@ -35,8 +34,7 @@ </edit> </match> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> @@ -47,8 +45,7 @@ </edit> </match> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> diff --git a/65-0-khmeros-siemreap.conf b/65-0-khmeros-siemreap.conf index 94d22c1..1d71172 100644 --- a/65-0-khmeros-siemreap.conf +++ b/65-0-khmeros-siemreap.conf @@ -10,8 +10,7 @@ </alias> <!-- Locale-specific overrides --> <match> - <test name="lang"> - <string>km-kh</string> + <test name="lang" compare="contains"> <string>km</string> </test> <test name="family"> diff --git a/khmeros-fonts.spec b/khmeros-fonts.spec index f924449..8369d8b 100644 --- a/khmeros-fonts.spec +++ b/khmeros-fonts.spec @@ -13,7 +13,7 @@ They were created by Danh Hong of the Cambodian Open Institute.
Name: %{fontname}-fonts Version: 5.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
Group: User Interface/X @@ -170,6 +170,9 @@ done
%changelog +* Thu Jul 05 2012 Parag <pnemade AT redhat.com> - 5.0-13 +- Resolves:rh#837520 - Malformed fontconfig config file + * Fri Jan 13 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 5.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
fonts-bugs@lists.fedoraproject.org
-
Parag Nemade