rpms/un-core-fonts/devel un-core-fonts-batang-fontconfig.conf, 1.1, 1.2 un-core-fonts-dinaru-fontconfig.conf, 1.1, 1.2 un-core-fonts-dotum-fontconfig.conf, 1.1, 1.2 un-core-fonts-graphic-fontconfig.conf, 1.1, 1.2 un-core-fonts-gungseo-fontconfig.conf, 1.1, 1.2 un-core-fonts-pilgi-fontconfig.conf, 1.1, 1.2 un-core-fonts.spec, 1.7, 1.8

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/un-core-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3488

Modified Files:
	un-core-fonts-batang-fontconfig.conf 
	un-core-fonts-dinaru-fontconfig.conf 
	un-core-fonts-dotum-fontconfig.conf 
	un-core-fonts-graphic-fontconfig.conf 
	un-core-fonts-gungseo-fontconfig.conf 
	un-core-fonts-pilgi-fontconfig.conf un-core-fonts.spec 
Log Message:
update .conf files to be locale-specific (#586877)


Index: un-core-fonts-batang-fontconfig.conf
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/un-core-fonts-batang-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- un-core-fonts-batang-fontconfig.conf	15 Oct 2008 06:07:53 -0000	1.1
+++ un-core-fonts-batang-fontconfig.conf	4 May 2010 11:01:06 -0000	1.2
@@ -1,16 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match>
+    <test name="lang">
+      <string>ko-kr</string>
+    </test>
+    <test name="family">
+      <string>serif</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>UnBatang</string>
+    </edit>
+  </match>
   <alias>
     <family>UnBatang</family>
     <default>
       <family>serif</family>
     </default>
   </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>UnBatang</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: un-core-fonts-dinaru-fontconfig.conf
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/un-core-fonts-dinaru-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- un-core-fonts-dinaru-fontconfig.conf	15 Oct 2008 06:07:54 -0000	1.1
+++ un-core-fonts-dinaru-fontconfig.conf	4 May 2010 11:01:06 -0000	1.2
@@ -1,16 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match>
+    <test name="lang">
+      <string>ko-kr</string>
+    </test>
+    <test name="family">
+      <string>fantasy</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>UnDinaru</string>
+    </edit>
+  </match>
   <alias>
     <family>UnDinaru</family>
     <default>
       <family>fantasy</family>
     </default>
   </alias>
-  <alias>
-    <family>fantasy</family>
-    <prefer>
-      <family>UnDinaru</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: un-core-fonts-dotum-fontconfig.conf
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/un-core-fonts-dotum-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- un-core-fonts-dotum-fontconfig.conf	15 Oct 2008 06:07:54 -0000	1.1
+++ un-core-fonts-dotum-fontconfig.conf	4 May 2010 11:01:06 -0000	1.2
@@ -1,16 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match>
+    <test name="lang">
+      <string>ko-kr</string>
+    </test>
+    <test name="family">
+      <string>sans-serif</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>UnDotum</string>
+    </edit>
+  </match>
   <alias>
     <family>UnDotum</family>
     <default>
       <family>sans-serif</family>
     </default>
   </alias>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>UnDotum</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: un-core-fonts-graphic-fontconfig.conf
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/un-core-fonts-graphic-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- un-core-fonts-graphic-fontconfig.conf	15 Oct 2008 06:07:54 -0000	1.1
+++ un-core-fonts-graphic-fontconfig.conf	4 May 2010 11:01:06 -0000	1.2
@@ -1,16 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match>
+    <test name="lang">
+      <string>ko-kr</string>
+    </test>
+    <test name="family">
+      <string>sans-serif</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>UnGraphic</string>
+    </edit>
+  </match>
   <alias>
     <family>UnGraphic</family>
     <default>
       <family>sans-serif</family>
     </default>
   </alias>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>UnGraphic</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: un-core-fonts-gungseo-fontconfig.conf
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/un-core-fonts-gungseo-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- un-core-fonts-gungseo-fontconfig.conf	15 Oct 2008 06:07:54 -0000	1.1
+++ un-core-fonts-gungseo-fontconfig.conf	4 May 2010 11:01:06 -0000	1.2
@@ -1,16 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match>
+    <test name="lang">
+      <string>ko-kr</string>
+    </test>
+    <test name="family">
+      <string>cursive</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>UnGungseo</string>
+    </edit>
+  </match>
   <alias>
     <family>UnGungseo</family>
     <default>
       <family>cursive</family>
     </default>
   </alias>
-  <alias>
-    <family>cursive</family>
-    <prefer>
-      <family>UnGungseo</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: un-core-fonts-pilgi-fontconfig.conf
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/un-core-fonts-pilgi-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- un-core-fonts-pilgi-fontconfig.conf	15 Oct 2008 06:07:54 -0000	1.1
+++ un-core-fonts-pilgi-fontconfig.conf	4 May 2010 11:01:06 -0000	1.2
@@ -1,16 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match>
+    <test name="lang">
+      <string>ko-kr</string>
+    </test>
+    <test name="family">
+      <string>script</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>UnPilgi</string>
+    </edit>
+  </match>
   <alias>
     <family>UnPilgi</family>
     <default>
       <family>script</family>
     </default>
   </alias>
-  <alias>
-    <family>script</family>
-    <prefer>
-      <family>UnPilgi</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: un-core-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/un-core-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- un-core-fonts.spec	27 Apr 2010 06:29:44 -0000	1.7
+++ un-core-fonts.spec	4 May 2010 11:01:06 -0000	1.8
@@ -32,7 +32,7 @@ Core 모음: \
 
 Name:           %{fontname}-fonts
 Version:        1.0.2
-Release:        0.11.%{alphatag}%{?dist}
+Release:        0.12.%{alphatag}%{?dist}
 Summary:        Un Core family of Korean TrueType fonts
 Summary(ko):    한글 은글꼴 Core 모음
 
@@ -204,6 +204,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May  4 2010 Jens Petersen <petersen at redhat.com> - 1.0.2-0.12.080608
+- update .conf files to be locale-specific (#586877)
+
 * Mon Apr 26 2010 Daiki Ueno <dueno at redhat.com> - 1.0.2-0.11.080608
 - use _font_pkg macro (#581734)
 - don't install un-core-fonts-*{light,bold}-fontconfig.conf