rpms/fontconfig/devel fontconfig-2.3.97-defaultconfig.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 fontconfig.spec, 1.87, 1.88 sources, 1.23, 1.24 fc-app-dir-fix-new.diff, 1.1, NONE fontconfig-2.3.93.cvs20060211-move-user-cache.patch, 1.2, NONE fontconfig-2.3.95-defaultconfig.patch, 1.4, NONE fontconfig-2.3.95-fd-leak.patch, 1.1, NONE fontconfig-2.3.95-fix-page-size-overflow.patch, 1.1, NONE fontconfig-2.3.95-ttf-collections.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Sep 7 21:41:08 UTC 2006
Author: besfahbo
Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13151
Modified Files:
.cvsignore fontconfig.spec sources
Added Files:
fontconfig-2.3.97-defaultconfig.patch
Removed Files:
fc-app-dir-fix-new.diff
fontconfig-2.3.93.cvs20060211-move-user-cache.patch
fontconfig-2.3.95-defaultconfig.patch
fontconfig-2.3.95-fd-leak.patch
fontconfig-2.3.95-fix-page-size-overflow.patch
fontconfig-2.3.95-ttf-collections.patch
Log Message:
* Thu Sep 07 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.3.97-1
- update to 2.3.97
- Drop upstreamed patches
- Regenerate defaultconfig patch
- Don't touch stamp as it was not ever needed
fontconfig-2.3.97-defaultconfig.patch:
fonts.conf.in | 191 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 145 insertions(+), 46 deletions(-)
--- NEW FILE fontconfig-2.3.97-defaultconfig.patch ---
--- fontconfig-2.3.97/fonts.conf.in.defaultconfig 2006-09-03 18:42:03.000000000 -0400
+++ fontconfig-2.3.97/fonts.conf.in 2006-09-07 16:46:01.000000000 -0400
@@ -85,8 +85,11 @@
<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>ZYSong18030</family>
<family>ï¼ï¼³ ææ</family>
<family>Baekmuk Batang</family>
<family>FreeSerif</family>
@@ -105,12 +108,15 @@
<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>
<family>Baekmuk Dotum</family>
<family>SimSun</family>
+ <family>ZYSong18030</family>
<family>FreeSans</family>
<family>MgOpen Modata</family>
<default><family>sans-serif</family></default>
@@ -126,8 +132,10 @@
<family>Andale Mono</family>
<family>Luxi Mono</family>
<family>Cumberland AMT</family>
+ <family>Cumberland</family>
<family>Nimbus Mono L</family>
<family>NSimSun</family>
+ <family>ZYSong18030</family>
<family>FreeMono</family>
<default><family>monospace</family></default>
</alias>
@@ -144,7 +152,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>
@@ -162,11 +170,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>
@@ -178,7 +194,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>
@@ -188,6 +208,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>
@@ -202,17 +226,52 @@
-->
<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>
<accept><family>Cumberland AMT</family></accept>
</alias>
-
+ <alias>
+ <family>Thorndale AMT</family>
+ <accept>
+ <family>Nimbus Roman No9 L</family>
+ </accept>
+ </alias>
+ <alias>
+ <family>Thorndale</family>
+ <accept>
+ <family>Thorndale AMT</family>
+ <family>Nimbus Roman No9 L</family>
+ </accept>
+
+ </alias>
+ <alias>
+ <family>Albany</family>
+ <accept>
+ <family>Albany AMT</family>
+ <family>Nimbus Sans L</family>
+ <family>Arial</family>
+ </accept>
+
+ </alias>
+ <alias>
+ <family>Cumberland</family>
+ <accept>
+ <family>Cumberland AMT</family>
+ </accept>
+ </alias>
<!--
Some Asian fonts misadvertise themselves as monospaced when
in fact they are dual-spaced (half and full). This makes
@@ -299,18 +358,31 @@
<alias>
<family>serif</family>
<prefer>
- <family>Bitstream Vera Serif</family>
- <family>DejaVu 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>MgOpen Canonica</family>
- <family>Kochi Mincho</family>
- <family>AR PL SungtiL GB</family>
- <family>AR PL Mingti2L Big5</family>
+ <family>Thorndale AMT</family>
+ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Luxi Serif</family>
+ <family>Times</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>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
+ <family>Sazanami Mincho</family>
+ <family>Kochi Mincho</family>
+ <family>MgOpen Canonica</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>
<family>FreeSerif</family>
@@ -319,40 +391,67 @@
<alias>
<family>sans-serif</family>
<prefer>
- <family>Bitstream Vera Sans</family>
- <family>DejaVu 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>Nachlieli</family>
- <family>MgOpen Modata</family>
- <family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>AR PL KaitiM Big5</family>
- <family>ï¼ï¼³ ã´ã·ãã¯</family>
- <family>Baekmuk Dotum</family>
- <family>SimSun</family>
- <family>FreeSans</family>
+ <family>Luxi Sans</family>
+ <family>Albany AMT</family>
+ <family>Bitstream Vera Sans</family>
+ <family>Verdana</family>
+ <family>Arial</family>
+ <family>Nimbus Sans L</family>
+ <family>Helvetica</family>
+ <family>KacstQura</family>
+ <family>Nachlieli</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
+ <family>Sazanami Gothic</family>
+ <family>Kochi Gothic</family>
+ <family>MgOpen Modata</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>
+ <family>ï¼ï¼³ ã´ã·ãã¯</family>
+ <family>FreeSans</family>
</prefer>
</alias>
<alias>
<family>monospace</family>
<prefer>
- <family>Bitstream Vera Sans Mono</family>
- <family>DejaVu Sans Mono</family>
- <family>Andale Mono</family>
- <family>Courier New</family>
- <family>Cumberland AMT</family>
- <family>Luxi Mono</family>
- <family>Nimbus Mono L</family>
- <family>Courier</family>
- <family>Miriam 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>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>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
+ <family>Nimbus Mono L</family>
+ <family>Courier</family>
+ <family>Sazanami Gothic</family>
<family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>Baekmuk Dotum</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>
</alias>
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 26 Apr 2006 16:41:41 -0000 1.22
+++ .cvsignore 7 Sep 2006 21:40:36 -0000 1.23
@@ -1 +1 @@
-fontconfig-2.3.95.tar.gz
+fontconfig-2.3.97.tar.gz
Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- fontconfig.spec 17 Aug 2006 22:05:17 -0000 1.87
+++ fontconfig.spec 7 Sep 2006 21:41:03 -0000 1.88
@@ -2,8 +2,8 @@
Summary: Font configuration and customization library
Name: fontconfig
-Version: 2.3.95
-Release: 11%{?dist}
+Version: 2.3.97
+Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -12,13 +12,8 @@
Source1: 40-blacklist-fonts.conf
Source2: 50-no-hint-fonts.conf
-Patch1: fontconfig-2.3.95-defaultconfig.patch
-Patch2: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
+Patch1: fontconfig-2.3.97-defaultconfig.patch
Patch3: fontconfig-2.4-cmap-parsing.patch
-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
@@ -55,12 +50,7 @@
%setup -q
%patch1 -p1 -b .defaultconfig
-%patch2 -p1 -b .move-user-cache
%patch3 -p1 -b .cmap-parsing
-%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
@@ -105,7 +95,6 @@
umask 0022
mkdir -p %{_localstatedir}/cache/fontconfig
-touch %{_localstatedir}/cache/fontconfig/stamp
# Force regeneration of all fontconfig cache files
# The check for existance is needed on dual-arch installs (the second
@@ -147,6 +136,12 @@
%{_mandir}/man3/*
%changelog
+* Thu Sep 07 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.3.97-1
+- update to 2.3.97
+- Drop upstreamed patches
+- Regenerate defaultconfig patch
+- Don't touch stamp as it was not ever needed
+
* 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)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 26 Apr 2006 16:41:41 -0000 1.23
+++ sources 7 Sep 2006 21:41:05 -0000 1.24
@@ -1 +1 @@
-6860be35882f6d34636d52345efd5944 fontconfig-2.3.95.tar.gz
+c7c7a1866341d73455271ad14d8db54e fontconfig-2.3.97.tar.gz
--- fc-app-dir-fix-new.diff DELETED ---
--- fontconfig-2.3.93.cvs20060211-move-user-cache.patch DELETED ---
--- fontconfig-2.3.95-defaultconfig.patch DELETED ---
--- fontconfig-2.3.95-fd-leak.patch DELETED ---
--- fontconfig-2.3.95-fix-page-size-overflow.patch DELETED ---
--- fontconfig-2.3.95-ttf-collections.patch DELETED ---
More information about the fedora-cvs-commits
mailing list