rpms/cjkuni-fonts/devel cjkuni-fonts-0.2.20080216.1-18.patch, NONE, 1.1 cjkuni-fonts.spec, 1.2, 1.3

[Caius Chance]

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25694

Modified Files:
	cjkuni-fonts.spec 
Added Files:
	cjkuni-fonts-0.2.20080216.1-18.patch 
Log Message:
resolves: rhbz#475743
patched uming 64-...conf for less over-prioritized.


cjkuni-fonts-0.2.20080216.1-18.patch:

--- NEW FILE cjkuni-fonts-0.2.20080216.1-18.patch ---
diff -up cjkuni-uming-fonts-0.2.20080216.1/64-ttf-arphic-uming.conf.2-rhbz475743 cjkuni-uming-fonts-0.2.20080216.1/64-ttf-arphic-uming.conf
--- cjkuni-uming-fonts-0.2.20080216.1/64-ttf-arphic-uming.conf.2-rhbz475743	2008-02-19 16:25:21.000000000 +1000
+++ cjkuni-uming-fonts-0.2.20080216.1/64-ttf-arphic-uming.conf	2009-02-02 01:18:23.000000000 +1000
@@ -1,25 +1,40 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>AR PL UMing HK</family>
-			<family>AR PL UMing CN</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>AR PL UMing HK</family>
-			<family>AR PL UMing CN</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>AR PL UMing HK</family>
-			<family>AR PL UMing CN</family>
-		</prefer>
-	</alias>
+	<match>
+		<test name="lang" compare="contains">
+			<string>zh</string>
+		</test>
+		<test name="family">
+			<string>serif</string>
+		</test>
+		<edit name="family" mode="prepend" binding="same">
+			<string>AR PL UMing HK</string>
+			<string>AR PL UMing CN</string>
+		</edit>
+	</match>
+	<match>
+		<test name="lang" compare="contains">
+			<string>zh</string>
+		</test>
+		<test name="family">
+			<string>sans-serif</string>
+		</test>
+		<edit name="family" mode="prepend" binding="same">
+			<string>AR PL UMing HK</string>
+			<string>AR PL UMing CN</string>
+		</edit>
+	</match>
+	<match>
+		<test name="lang" compare="contains">
+			<string>zh</string>
+		</test>
+		<test name="family">
+			<string>monospace</string>
+		</test>
+		<edit name="family" mode="prepend" binding="same">
+			<string>AR PL UMing HK</string>
+			<string>AR PL UMing CN</string>
+		</edit>
+	</match>
 </fontconfig>


Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cjkuni-fonts.spec	22 Jan 2009 02:16:39 -0000	1.2
+++ cjkuni-fonts.spec	1 Feb 2009 23:15:49 -0000	1.3
@@ -12,7 +12,7 @@
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     17%{?dist}
+Release:     18%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -27,6 +27,7 @@
 Source7:    CIDFnmap.zh_TW
 Source8:    CIDFnmap.zh_CN
 Patch1:     cjkunifonts-0.2.20080216.1-2.patch
+Patch2:     cjkuni-fonts-0.2.20080216.1-18.patch
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
@@ -130,6 +131,7 @@
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
 %patch1 -p1 -b .1-rhbz466667
+%patch2 -p1 -b .2-rhbz475743
 %setup -q -c -T -a2 -n %{ukaibuilddir}
 
 %build
@@ -192,6 +194,10 @@
 %__rm -fr %{buildroot}
 
 %changelog
+* Mon Feb 02 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-18.fc11
+- Resolves: rhbz#475743
+- Fixed Japanese fonts over-priorized by uming fonts in Japanese locale.
+
 * Thu Jan 22 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-17.fc11
 - Resolves: rhbz#477373
 - Refined package dependencies and compat font symlinks.