rpms/wqy-zenhei-fonts/devel 65-0-wqy-zenhei-sharp.conf, NONE, 1.1 65-0-wqy-zenhei.conf, NONE, 1.1 zenheiset, NONE, 1.1 wqy-zenhei-fonts.spec, 1.16, 1.17
Peng Wu
pwu at fedoraproject.org
Wed May 26 03:00:50 UTC 2010
Author: pwu
Update of /cvs/pkgs/rpms/wqy-zenhei-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12632
Modified Files:
wqy-zenhei-fonts.spec
Added Files:
65-0-wqy-zenhei-sharp.conf 65-0-wqy-zenhei.conf zenheiset
Log Message:
* Wed May 26 2010 Peng Wu <pwu at redhat.com> - 0.9.45-3
- Improves Simplified Chinese and Traditional Chinese fonts.
Resolves [rhbz#595223] Improves SC/TC fonts - Make wqy-zenhei as the default font for Simplified Chinese.
--- NEW FILE 65-0-wqy-zenhei-sharp.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
<test name="lang">
<string>zh-cn</string>
<string>zh-sg</string>
</test>
<test name="family">
<string>monospace</string>
</test>
<edit name="family" mode="prepend">
<string>WenQuanYi Zen Hei Sharp</string>
</edit>
</match>
<alias>
<family>WenQuanYi Zen Hei Sharp</family>
<default>
<family>monospace</family>
</default>
</alias>
<match>
<test name="lang">
<string>zh-cn</string>
<string>zh-sg</string>
</test>
<test name="family">
<string>serif</string>
</test>
<edit name="family" mode="prepend">
<string>WenQuanYi Zen Hei Sharp</string>
</edit>
</match>
<alias>
<family>WenQuanYi Zen Hei Sharp</family>
<default>
<family>serif</family>
</default>
</alias>
<match>
<test name="lang">
<string>zh-cn</string>
<string>zh-sg</string>
</test>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>WenQuanYi Zen Hei Sharp</string>
</edit>
</match>
<alias>
<family>WenQuanYi Zen Hei Sharp</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>
--- NEW FILE 65-0-wqy-zenhei.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
<test name="lang">
<string>zh-cn</string>
<string>zh-sg</string>
</test>
<test name="family">
<string>monospace</string>
</test>
<edit name="family" mode="prepend">
<string>WenQuanYi Zen Hei Mono</string>
</edit>
</match>
<alias>
<family>WenQuanYi Zen Hei Mono</family>
<default>
<family>monospace</family>
</default>
</alias>
<match>
<test name="lang">
<string>zh-cn</string>
<string>zh-sg</string>
</test>
<test name="family">
<string>serif</string>
</test>
<edit name="family" mode="prepend">
<string>WenQuanYi Zen Hei</string>
</edit>
</match>
<alias>
<family>WenQuanYi Zen Hei</family>
<default>
<family>serif</family>
</default>
</alias>
<match>
<test name="lang">
<string>zh-cn</string>
<string>zh-sg</string>
</test>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>WenQuanYi Zen Hei</string>
</edit>
</match>
<alias>
<family>WenQuanYi Zen Hei</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>
--- NEW FILE zenheiset ---
#!/bin/sh
###############################################
# Set WenQuanYi Zen Hei Default Display Styles
#
# Qianqian Fang <fangq at nmr.mgh.harvard.edu>
###############################################
FAVAIL=/usr/share/fontconfig/conf.avail
FCONF=/etc/fonts/conf.d
BMPCONF=65-0-wqy-zenhei-sharp.conf
AACONF=65-0-wqy-zenhei.conf
if [ $UID -ne 0 ]; then
echo 1>&2 Please run $0 as root user.
exit 2
fi
if [ $# -ne 1 ]; then
echo 1>&2 Usage: $0 \[aa\|bitmap\|bitmapfull\]
exit 2
fi
if [ $1 = "aa" -o $1 = "bitmap" -o $1 = "bitmapfull" ]; then
if [ $1 == "aa" ]; then
if [ -f "$FAVAIL/$AACONF" ]; then
ln -sf $FAVAIL/$AACONF $FCONF/$AACONF
rm -f $FCONF/$BMPCONF
else
echo $FAVAIL/$AACONF does not exist!
exit 2
fi
fi
if [ $1 = "bitmap" -o $1 = "bitmapfull" ]; then
if [ -f "$FAVAIL/$BMPCONF" ]; then
ln -sf $FAVAIL/$BMPCONF $FCONF/$BMPCONF
rm -f $FCONF/$AACONF
else
echo $FAVAIL/$BMPCONF does not exist!
exit 2
fi
fi
else
echo $1 is not a valid option
fi
exit 0
Index: wqy-zenhei-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/wqy-zenhei-fonts.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- wqy-zenhei-fonts.spec 19 Apr 2010 05:53:52 -0000 1.16
+++ wqy-zenhei-fonts.spec 26 May 2010 03:00:47 -0000 1.17
@@ -1,7 +1,6 @@
%global fontname wqy-zenhei
-%global fontconf 44-%{fontname}.conf
-%global fontconf1 65-%{fontname}.conf
-%global fontconf2 43-%{fontname}-sharp.conf
+%global fontconf1 65-0-%{fontname}.conf
+%global fontconf2 65-0-%{fontname}-sharp.conf
%define common_desc \
WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese \
outline font. It is designed for general purpose text formatting \
@@ -25,22 +24,24 @@ named "WenQuanYi Zen Hei Mono".
Name: %{fontname}-fonts
Version: 0.9.45
-Release: 2%{?dist}
+Release: 3%{?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}.tar.gz
-Source1: %{fontname}-fontconfig.conf
+Source1: %{fontconf1}
+Source2: %{fontconf2}
+Source3: %{setscript}
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
-Patch0: wqy-zenhei-fonts-0.8.34-1-noprefer.patch
-Patch1: zenheiset-0.8.38-1-fontpackages.patch
-Patch2: wqy-zenhei-fonts-0.8.38-1-zenheiset.patch
+#Patch0: wqy-zenhei-fonts-0.8.34-1-noprefer.patch
+#Patch1: zenheiset-0.8.38-1-fontpackages.patch
+#Patch2: wqy-zenhei-fonts-0.8.38-1-zenheiset.patch
%description
%common_desc
@@ -56,12 +57,13 @@ This package consists of files used by o
%prep
%setup -q -n %{fontname}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
%build
+%{nil}
%install
rm -fr %{buildroot}
@@ -72,39 +74,39 @@ install -m 0644 -p *.ttc %{buildroot}%{_
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
-install -m 0644 -p %{fontconf} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
install -m 0644 -p %{SOURCE1} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf1}
-install -m 0644 -p %{fontconf2} \
+install -m 0644 -p %{SOURCE2} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
-ln -s %{_fontconfig_templatedir}/%{fontconf} \
- %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+#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 0755 -d %{buildroot}%{_bindir}
-#install -m 0744 -p %{setscript} \
-# %{buildroot}%{_bindir}/%{setscript}
+install -m 0744 -p %{SOURCE3} \
+ %{buildroot}%{_bindir}/%{setscript}
%clean
rm -fr %{buildroot}
-%_font_pkg -f ??-%{fontname}*.conf *.ttc
-
-%dir %{_fontdir}
-
-%files common
-%defattr(-,root,root,-)
+%_font_pkg -f ??-?-%{fontname}*.conf *.ttc
+#%dir %{_fontdir}
+#%files common
+#%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
-%doc %attr(0755 ,root ,root) %{setscript}
+%attr(755, root, root) %{_bindir}/%{setscript}
%changelog
+* Wed May 26 2010 Peng Wu <pwu at redhat.com> - 0.9.45-3
+- Improves Simplified Chinese and Traditional Chinese fonts.
+ Resolves [rhbz#595223] Improves SC/TC fonts - Make wqy-zenhei as the default font for Simplified Chinese.
+
* Mon Apr 19 2010 Peng Wu <pwu at redhat.com> - 0.9.45-2
- get rid of binding="same", fixes [rhbz#578051] New: lang-specific overrides rule doesn't work as expected.
More information about the scm-commits
mailing list