rpms/wqy-zenhei-fonts/devel wqy-zenhei-fontconfig.conf, NONE, 1.1 wqy-zenhei-fonts.spec, 1.12, 1.13

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/wqy-zenhei-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8015

Modified Files:
	wqy-zenhei-fonts.spec 
Added Files:
	wqy-zenhei-fontconfig.conf 
Log Message:
add a fedora fontconfig file for zh (#476459)



--- NEW FILE wqy-zenhei-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
    <match target="font">
        <test name="family">
            <string>WenQuanYi Zen Hei</string>
        </test>
        <edit name="hinting" mode="assign">
            <bool>false</bool>
        </edit>
    </match>
    
    <match>
        <test name="lang">
            <string>zh</string>
        </test>
        <test name="family">
            <string>monospace</string>
        </test>
        <edit name="family" mode="prepend" binding="same">
            <string>WenQuanYi Zen Hei</string>
        </edit>
    </match>

    <alias>
        <family>WenQuanYi Zen Hei</family>
        <default>
            <family>monospace</family>
        </default>
    </alias>

    <match>
        <test name="lang">
            <string>zh</string>
        </test>
        <test name="family">
            <string>sans-serif</string>
        </test>
        <edit name="family" mode="prepend" binding="same">
            <string>WenQuanYi Zen Hei</string>
        </edit>
    </match>

    <alias>
        <family>WenQuanYi Zen Hei</family>
        <default>
            <family>sans-serif</family>
        </default>
    </alias>
</fontconfig>


Index: wqy-zenhei-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/wqy-zenhei-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- wqy-zenhei-fonts.spec	27 Jul 2009 07:28:09 -0000	1.12
+++ wqy-zenhei-fonts.spec	21 Dec 2009 01:06:54 -0000	1.13
@@ -1,26 +1,27 @@
 %define fontname wqy-zenhei
 %define fontconf  44-%{fontname}.conf
+%global fontconf1 65-%{fontname}.conf
 %define fontconf2 66-%{fontname}-sharp.conf
 %define fontconf3 66-%{fontname}-sharp-no13px.conf
 %define setscript zenheiset
 
 Name:           %{fontname}-fonts
 Version:        0.8.38
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        WenQuanYi Zen Hei CJK Font
 
 Group:          User Interface/X
 License:        GPLv2 with exceptions
 URL:            http://wenq.org/enindex.cgi
 Source0:        http://downloads.sourceforge.net/wqy/%{fontname}-%{version}-1.tar.gz
-#Source1:        66-%{name}-sharp.conf
+Source1:        %{fontname}-fontconfig.conf
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Patch0: %{name}-0.8.34-1-noprefer.patch
-Patch1: zenheiset-0.8.38-1-fontpackages.patch
+Patch0:         wqy-zenhei-fonts-0.8.34-1-noprefer.patch
+Patch1:         zenheiset-0.8.38-1-fontpackages.patch
 
 %description
 WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese 
@@ -62,6 +63,8 @@ install -m 0755 -d %{buildroot}%{_fontco
 
 install -m 0644 -p %{fontconf} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}
 install -m 0644 -p %{fontconf2} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
 install -m 0644 -p %{fontconf3} \
@@ -70,6 +73,9 @@ install -m 0644 -p %{fontconf3} \
 ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
+ln -s %{_fontconfig_templatedir}/%{fontconf1} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf1}
+
 install -m 0755 -d %{buildroot}%{_bindir}
 
 install -m 0744 -p %{setscript} \
@@ -87,6 +93,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Jens Petersen <petersen at redhat.com> - 0.8.38-4
+- add a fedora fontconfig file for zh (#476459)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.38-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild