pwu pushed to wqy-zenhei-fonts (master). "Lower font priority"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 4 07:24:45 UTC 2015
>From 4390d6d577ce5f2a8b109ab4898692fc90f70d66 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico at gmail.com>
Date: Mon, 4 May 2015 14:52:11 +0800
Subject: Lower font priority
diff --git a/65-0-wqy-zenhei-sharp.conf b/65-0-wqy-zenhei-sharp.conf
deleted file mode 100644
index 02b7852..0000000
--- a/65-0-wqy-zenhei-sharp.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
- <match>
- <test name="lang">
- <string>zh-cn</string>
- </test>
- <test name="family">
- <string>monospace</string>
- </test>
- <edit name="family" mode="prepend">
- <string>WenQuanYi Zen Hei Sharp</string>
- </edit>
- </match>
- <match>
- <test name="lang">
- <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>
- </test>
- <test name="family">
- <string>serif</string>
- </test>
- <edit name="family" mode="prepend">
- <string>WenQuanYi Zen Hei Sharp</string>
- </edit>
- </match>
- <match>
- <test name="lang">
- <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>
- </test>
- <test name="family">
- <string>sans-serif</string>
- </test>
- <edit name="family" mode="prepend">
- <string>WenQuanYi Zen Hei Sharp</string>
- </edit>
- </match>
- <match>
- <test name="lang">
- <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>
diff --git a/65-0-wqy-zenhei.conf b/65-0-wqy-zenhei.conf
deleted file mode 100644
index e0bef12..0000000
--- a/65-0-wqy-zenhei.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
- <match>
- <test name="lang">
- <string>zh-cn</string>
- </test>
- <test name="family">
- <string>monospace</string>
- </test>
- <edit name="family" mode="prepend">
- <string>WenQuanYi Zen Hei Mono</string>
- </edit>
- </match>
- <match>
- <test name="lang">
- <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>
- </test>
- <test name="family">
- <string>serif</string>
- </test>
- <edit name="family" mode="prepend">
- <string>WenQuanYi Zen Hei</string>
- </edit>
- </match>
- <match>
- <test name="lang">
- <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>
- </test>
- <test name="family">
- <string>sans-serif</string>
- </test>
- <edit name="family" mode="prepend">
- <string>WenQuanYi Zen Hei</string>
- </edit>
- </match>
- <match>
- <test name="lang">
- <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>
diff --git a/wqy-zenhei-fonts-fontconfig.conf b/wqy-zenhei-fonts-fontconfig.conf
new file mode 100644
index 0000000..02b7852
--- /dev/null
+++ b/wqy-zenhei-fonts-fontconfig.conf
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <match>
+ <test name="lang">
+ <string>zh-cn</string>
+ </test>
+ <test name="family">
+ <string>monospace</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+ <match>
+ <test name="lang">
+ <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>
+ </test>
+ <test name="family">
+ <string>serif</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+ <match>
+ <test name="lang">
+ <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>
+ </test>
+ <test name="family">
+ <string>sans-serif</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+ <match>
+ <test name="lang">
+ <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>
diff --git a/wqy-zenhei-fonts.spec b/wqy-zenhei-fonts.spec
index 78044e3..e3a0af1 100644
--- a/wqy-zenhei-fonts.spec
+++ b/wqy-zenhei-fonts.spec
@@ -1,6 +1,5 @@
%global fontname wqy-zenhei
-%global fontconf1 65-0-%{fontname}.conf
-%global fontconf2 65-0-%{fontname}-sharp.conf
+%global fontconf2 65-%{fontname}-sharp.conf
%global common_desc \
WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese \
outline font. It is designed for general purpose text formatting \
@@ -20,20 +19,17 @@ and ko (Korean) locales for fontconfig. Starting from version \
the proportionally-spaced Zen Hei, and a mono-spaced face \
named "WenQuanYi Zen Hei Mono".
-%global setscript zenheiset
Name: %{fontname}-fonts
Version: 0.9.46
-Release: 12%{?dist}
+Release: 13%{?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}-May.tar.bz2
-Source1: %{fontconf1}
-Source2: %{fontconf2}
-Source3: %{setscript}
+Source2: %{name}-fontconfig.conf
BuildArch: noarch
BuildRequires: fontpackages-devel
@@ -65,28 +61,21 @@ install -m 0644 -p *.ttc %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
-install -m 0644 -p %{SOURCE1} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}
install -m 0644 -p %{SOURCE2} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
ln -s %{_fontconfig_templatedir}/%{fontconf2} \
%{buildroot}%{_fontconfig_confdir}/%{fontconf2}
-install -m 0755 -d %{buildroot}%{_bindir}
-install -m 0755 -p %{SOURCE3} \
- %{buildroot}%{_bindir}/%{setscript}
-
-
-%_font_pkg -f ??-?-%{fontname}*.conf *.ttc
-%dir %{_fontdir}
+%_font_pkg -f ??-%{fontname}*.conf *.ttc
%doc AUTHORS ChangeLog COPYING README
-%defattr(-, root, root, -)
-%{_bindir}/%{setscript}
%changelog
+* Mon May 4 2015 Peng Wu <pwu at redhat.com> - 0.9.46-13
+- Lower font priority, as Adobe Source Han Sans are default Chinese fonts
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.46-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/zenheiset b/zenheiset
deleted file mode 100644
index f9b3a37..0000000
--- a/zenheiset
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/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
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/wqy-zenhei-fonts.git/commit/?h=master&id=4390d6d577ce5f2a8b109ab4898692fc90f70d66
More information about the scm-commits
mailing list