rpms/fontconfig/devel fontconfig-2.3.95-defaultconfig.patch, NONE, 1.1 fontconfig.spec, 1.73, 1.74 fontconfig-2.3.93-defaultconfig.patch, 1.6, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 26 17:22:10 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23416
Modified Files:
fontconfig.spec
Added Files:
fontconfig-2.3.95-defaultconfig.patch
Removed Files:
fontconfig-2.3.93-defaultconfig.patch
Log Message:
2.3.95
fontconfig-2.3.95-defaultconfig.patch:
fonts.conf.in | 102 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 25 deletions(-)
--- NEW FILE fontconfig-2.3.95-defaultconfig.patch ---
--- fontconfig-2.3.95/fonts.conf.in.defaultconfig 2006-04-26 13:07:47.000000000 -0400
+++ fontconfig-2.3.95/fonts.conf.in 2006-04-26 13:07:56.000000000 -0400
@@ -80,6 +80,8 @@
<family>Nimbus Roman No9 L</family>
<family>Luxi Serif</family>
<family>Kochi Mincho</family>
+ <family>Sazanami Mincho</family>>
+ <family>AR PL ZenKai Uni</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>ï¼ï¼³ 明æœ</family>
@@ -100,7 +102,9 @@
<family>Albany AMT</family>
<family>Nimbus Sans L</family>
<family>Luxi Sans</family>
+ <family>Sazanami Gothic</family>
<family>Kochi Gothic</family>
+ <family>AR PL ShanHeiSun Uni</family
<family>AR PL KaitiM GB</family>
<family>AR PL KaitiM Big5</family>
<family>ï¼ï¼³ ゴシック</family>
@@ -138,7 +142,7 @@
<test qual="all" name="family" compare="not_eq">
<string>monospace</string>
</test>
- <edit name="family" mode="append_last">
+ <edit name="family" mode="append_last">
<string>sans-serif</string>
</edit>
</match>
@@ -156,11 +160,19 @@
</alias>
<alias>
<family>Courier</family>
- <accept><family>Nimbus Mono L</family></accept>
+ <accept>
+ <family>Cumberland AMT</family>
+ <family>Courier New</family>
+ <family>Nimbus Mono L</family>
+ </accept>
</alias>
<alias>
<family>Helvetica</family>
- <accept><family>Nimbus Sans L</family></accept>
+ <accept>
+ <family>Nimbus Sans L</family>
+ <family>Albany AMT</family>
+ <family>Arial</family>
+ </accept>
</alias>
<alias>
<family>New Century Schoolbook</family>
@@ -172,7 +184,11 @@
</alias>
<alias>
<family>Times</family>
- <accept><family>Nimbus Roman No9 L</family></accept>
+ <accept>
+ <family>Nimbus Roman No9 L</family>
+ <family>Thorndale AMT</family>
+ <family>Times New Roman</family>
+ </accept>
</alias>
<alias>
<family>Zapf Chancery</family>
@@ -182,6 +198,10 @@
<family>Zapf Dingbats</family>
<accept><family>Dingbats</family></accept>
</alias>
+ <alias>
+ <family>ZapfDingbats</family>
+ <accept><family>Dingbats</family></accept>
+ </alias>
<match target="pattern">
<test name="family">
<string>Symbol</string>
@@ -196,11 +216,18 @@
-->
<alias>
<family>Times New Roman</family>
- <accept><family>Thorndale AMT</family></accept>
+ <accept>
+ <family>Thorndale AMT</family>
+ <family>Nimbus Roman No9 L</family>
+ </accept>
</alias>
<alias>
<family>Arial</family>
- <accept><family>Albany AMT</family></accept>
+ <accept>
+ <family>Albany AMT</family>
+ <family>Nimbus Sans L</family>
+ <family>Arial</family>
+ </accept>
</alias>
<alias>
<family>Courier New</family>
@@ -293,17 +320,25 @@
<alias>
<family>serif</family>
<prefer>
- <family>DejaVu Serif</family>
+ <family>Nimbus Roman No9 L</family>
+ <family>Thorndale AMT</family>
<family>Bitstream Vera Serif</family>
<family>Times New Roman</family>
- <family>Thorndale AMT</family>
<family>Luxi Serif</family>
- <family>Nimbus Roman No9 L</family>
<family>Times</family>
- <family>Frank Ruehl</family>
+ <family>KacstQura</family>
+ <family>Frank Ruehl CLM</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Sazanami Mincho</family>
+ <family>Kochi Mincho</family>
+ <family>ZYSong18030</family>
<family>MgOpen Canonica</family>
<family>FreeSerif</family>
- <family>Kochi Mincho</family>
+ <family>AR PL Zenkai Uni</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>ï¼ï¼³ 明æœ</family>
@@ -313,41 +348,58 @@
<alias>
<family>sans-serif</family>
<prefer>
- <family>DejaVu Sans</family>
+ <family>Luxi Sans</family>
+ <family>Albany AMT</family>
<family>Bitstream Vera Sans</family>
<family>Verdana</family>
<family>Arial</family>
- <family>Albany AMT</family>
- <family>Luxi Sans</family>
<family>Nimbus Sans L</family>
<family>Helvetica</family>
+ <family>KacstQura</family>
<family>Nachlieli</family>
- <family>MgOpen Modata</family>
- <family>FreeSans</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Sazanami Gothic</family>
<family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>AR PL KaitiM Big5</family>
<family>ï¼ï¼³ ゴシック</family>
- <family>Baekmuk Dotum</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>Baekmuk Gulim</family>
<family>SimSun</family>
</prefer>
</alias>
<alias>
<family>monospace</family>
<prefer>
- <family>DejaVu Sans Mono</family>
+ <family>Luxi Mono</family>
<family>Bitstream Vera Sans Mono</family>
<family>Andale Mono</family>
<family>Courier New</family>
<family>Cumberland AMT</family>
- <family>Luxi Mono</family>
+ <family>KacstQura</family>
+ <family>Miriam Mono CLM</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
<family>Nimbus Mono L</family>
<family>Courier</family>
- <family>Miriam Mono</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>Baekmuk Gulim</family>
<family>FreeMono</family>
- <family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>Baekmuk Dotum</family>
</prefer>
</alias>
Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- fontconfig.spec 26 Apr 2006 16:41:41 -0000 1.73
+++ fontconfig.spec 26 Apr 2006 17:22:08 -0000 1.74
@@ -12,7 +12,7 @@
Source1: 40-blacklist-fonts.conf
Source2: 50-no-hint-fonts.conf
-Patch1: fontconfig-2.3.93-defaultconfig.patch
+Patch1: fontconfig-2.3.95-defaultconfig.patch
Patch2: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
BuildRequires: freetype-devel >= %{freetype_version}
--- fontconfig-2.3.93-defaultconfig.patch DELETED ---
More information about the fedora-cvs-commits
mailing list