[thai-scalable-fonts] Update to 0.5.0-2.

[Daiki Ueno]

commit 0de6cbc69b8cdb0a104df5a1683fa097a213e135
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Thu Jul 5 10:18:02 2012 +0900

    Update to 0.5.0-2.

 90-thai-scalable-synthetic-garuda.conf  |   25 +++++++++++++++----------
 90-thai-scalable-synthetic-kinnari.conf |   25 +++++++++++++++----------
 90-thai-scalable-synthetic-umpush.conf  |   25 +++++++++++++++----------
 thai-scalable-fonts.spec                |    6 +++++-
 4 files changed, 50 insertions(+), 31 deletions(-)
---
diff --git a/90-thai-scalable-synthetic-garuda.conf b/90-thai-scalable-synthetic-garuda.conf
index 9a7686b..39cf739 100644
--- a/90-thai-scalable-synthetic-garuda.conf
+++ b/90-thai-scalable-synthetic-garuda.conf
@@ -3,20 +3,25 @@
 <fontconfig>
 	<!-- Synthesize Windows Browallia with scaled-down Garuda -->
 	<match target="pattern">
-		<test qual="any" name="family" mode="eq">
-			<string>BrowalliaUPC</string>
-			<string>Browallia New</string>
+		<test qual="any" name="family" compare="contains">
+			<string>Browallia</string>
 		</test>
-		<edit name="family" mode="assign" binding="same">
+		<edit name="family" mode="append" binding="same">
 			<string>Garuda</string>
 		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Garuda</string>
+		</test>
+		<test target="pattern" qual="any" name="family" compare="contains">
+			<string>Browallia</string>
+		</test>
 		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>0.68</double><double>0</double>
-				        <double>0</double><double>0.68</double>
-				</matrix>
-			</times>
+			<matrix>
+				<double>0.68</double><double>0</double>
+				<double>0</double><double>0.68</double>
+			</matrix>
 		</edit>
 	</match>
 </fontconfig>
diff --git a/90-thai-scalable-synthetic-kinnari.conf b/90-thai-scalable-synthetic-kinnari.conf
index 617c0c6..417f5a5 100644
--- a/90-thai-scalable-synthetic-kinnari.conf
+++ b/90-thai-scalable-synthetic-kinnari.conf
@@ -3,20 +3,25 @@
 <fontconfig>
 	<!-- Synthesize Windows Angsana with scaled-down Kinnari -->
 	<match target="pattern">
-		<test qual="any" name="family" mode="eq">
-			<string>AngsanaUPC</string>
-			<string>Angsana New</string>
+		<test qual="any" name="family" compare="contains">
+			<string>Angsana</string>
 		</test>
-		<edit name="family" mode="assign" binding="same">
+		<edit name="family" mode="append" binding="same">
 			<string>Kinnari</string>
 		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Kinnari</string>
+		</test>
+		<test target="pattern" qual="any" name="family" compare="contains">
+			<string>Angsana</string>
+		</test>
 		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>0.67</double><double>0</double>
-				        <double>0</double><double>0.67</double>
-				</matrix>
-			</times>
+			<matrix>
+				<double>0.67</double><double>0</double>
+				<double>0</double><double>0.67</double>
+			</matrix>
 		</edit>
 	</match>
 </fontconfig>
diff --git a/90-thai-scalable-synthetic-umpush.conf b/90-thai-scalable-synthetic-umpush.conf
index 709560c..f0892b6 100644
--- a/90-thai-scalable-synthetic-umpush.conf
+++ b/90-thai-scalable-synthetic-umpush.conf
@@ -3,20 +3,25 @@
 <fontconfig>
 	<!-- Synthesize Windows Cordia with scaled-down Umpush -->
 	<match target="pattern">
-		<test qual="any" name="family" mode="eq">
-			<string>CordiaUPC</string>
-			<string>Cordia New</string>
+		<test qual="any" name="family" compare="contains">
+			<string>Cordia</string>
 		</test>
-		<edit name="family" mode="assign" binding="same">
+		<edit name="family" mode="append" binding="same">
 			<string>Umpush</string>
 		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Umpush</string>
+		</test>
+		<test target="pattern" qual="any" name="family" compare="contains">
+			<string>Cordia</string>
+		</test>
 		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>0.65</double><double>0</double>
-				        <double>0</double><double>0.65</double>
-				</matrix>
-			</times>
+			<matrix>
+				<double>0.65</double><double>0</double>
+				<double>0</double><double>0.65</double>
+			</matrix>
 		</edit>
 	</match>
 </fontconfig>
diff --git a/thai-scalable-fonts.spec b/thai-scalable-fonts.spec
index dc7fc80..63ca0bb 100644
--- a/thai-scalable-fonts.spec
+++ b/thai-scalable-fonts.spec
@@ -8,7 +8,7 @@
 
 Name:      %{fontname}-fonts
 Version:   0.5.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Thai TrueType fonts
 Group:     User Interface/X
 License:   GPLv2+
@@ -268,6 +268,10 @@ done
 
 
 %changelog
+* Thu Jul  5 2012 Daiki Ueno <dueno at redhat.com> - 0.5.0-2
+- fix <test> usage in fontconfig files (Closes: #837538)
+- refresh fontconfig files with the latest upstream version
+
 * Wed Feb 15 2012 Daiki Ueno <dueno at redhat.com> - 0.5.0-1
 - update to 0.5.0
 - change %%archivename to fonts-tlwg per upstream