rpms/fontconfig/devel fontconfig-2.3.95-zysong01.patch, NONE, 1.1 fontconfig.spec, 1.86, 1.87

[fedora-cvs-commits at redhat.com]

Author: besfahbo

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19596

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.95-zysong01.patch 
Log Message:
- inclusion of zhong yi font and rearranged font prefer list. (bug# 201300)


fontconfig-2.3.95-zysong01.patch:
 fonts.conf.in |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE fontconfig-2.3.95-zysong01.patch ---
--- fontconfig-2.3.95/fonts.conf.in.zysong01	2006-08-14 16:18:51.000000000 +1000
+++ fontconfig-2.3.95/fonts.conf.in	2006-08-14 16:21:24.000000000 +1000
@@ -84,6 +84,7 @@
                 <family>AR PL ZenKai Uni</family>
 		<family>AR PL SungtiL GB</family>
 		<family>AR PL Mingti2L Big5</family>
+		<family>ZYSong18030</family>
 		<family>ＭＳ 明朝</family>
 		<family>Baekmuk Batang</family>
 		<family>FreeSerif</family>
@@ -110,6 +111,7 @@
 		<family>ＭＳ ゴシック</family>
 		<family>Baekmuk Dotum</family>
 		<family>SimSun</family>
+		<family>ZYSong18030</family>
 		<family>FreeSans</family>
 		<family>MgOpen Modata</family>
 		<default><family>sans-serif</family></default>
@@ -127,6 +129,7 @@
 		<family>Cumberland</family>
 		<family>Nimbus Mono L</family>
 		<family>NSimSun</family>
+		<family>ZYSong18030</family>
 		<family>FreeMono</family>
 		<default><family>monospace</family></default>
 	</alias>
@@ -369,12 +372,12 @@
 			<family>LKLUG</family>
 			<family>Sazanami Mincho</family>
 			<family>Kochi Mincho</family>
-			<family>ZYSong18030</family>
 			<family>MgOpen Canonica</family>
 			<family>FreeSerif</family>
 			<family>AR PL Zenkai Uni</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
+			<family>ZYSong18030</family>
 			<family>ＭＳ 明朝</family>
 			<family>Baekmuk Batang</family>
 		</prefer>
@@ -406,10 +409,10 @@
 			<family>ＭＳ ゴシック</family>
 			<family>MgOpen Modata</family>
 			<family>FreeSans</family>
-                        <family>ZYSong18030</family>
 			<family>AR PL ShanHeiSun Uni</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
+                        <family>ZYSong18030</family>
 			<family>Baekmuk Gulim</family>
 			<family>SimSun</family>
 		</prefer>
@@ -438,10 +441,10 @@
 			<family>Courier</family>
                         <family>Sazanami Gothic</family>
                         <family>Kochi Gothic</family>
-                        <family>ZYSong18030</family>
 			<family>AR PL ShanHeiSun Uni</family>
                         <family>AR PL SungtiL GB</family>
                         <family>AR PL Mingti2L Big5</family>
+                        <family>ZYSong18030</family>
                         <family>Baekmuk Gulim</family>
 			<family>FreeMono</family>
 		</prefer>


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- fontconfig.spec	11 Aug 2006 17:35:44 -0000	1.86
+++ fontconfig.spec	17 Aug 2006 22:05:17 -0000	1.87
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -18,6 +18,7 @@
 Patch4: fontconfig-2.3.95-ttf-collections.patch
 Patch5: fontconfig-2.3.95-fd-leak.patch
 Patch6: fontconfig-2.3.95-fix-page-size-overflow.patch
+Patch7: fontconfig-2.3.95-zysong01.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -59,6 +60,7 @@
 %patch4 -p1 -b .ttf-collections
 %patch5 -p1 -b .fd-leak
 %patch6 -p1 -b .fix-page-size-overflow
+%patch7 -p1 -b .zysong01
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -145,6 +147,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 17 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.3.95-11
+- inclusion of zhong yi font and rearranged font prefer list. (bug# 201300)
+
 * Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-10
 - use "%5x" instead of " %4x" to support 64k instead of
   clamping.  Idea from Behdad.