rpms/wqy-zenhei-fonts/devel wqy-zenhei-fonts.spec,1.6,1.7

[Qianqian Fang]

Author: fangq

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

Modified Files:
	wqy-zenhei-fonts.spec 
Log Message:
use fontpackages macro


Index: wqy-zenhei-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/wqy-zenhei-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wqy-zenhei-fonts.spec	28 Oct 2008 03:40:18 -0000	1.6
+++ wqy-zenhei-fonts.spec	10 Feb 2009 05:04:03 -0000	1.7
@@ -1,83 +1,79 @@
-%define fontname        wqy-zenhei
-%define fontdir         %{_datadir}/fonts/%{fontname}
-%define fontconfdir     %{_sysconfdir}/fonts/conf.d
-%define catalogue       %{_sysconfdir}/X11/fontpath.d
-
-Name: %{fontname}-fonts
-Summary: WenQuanYi Zen Hei CJK Font
-Version: 0.8.34
-Release: 0.cvs20081027%{?dist}
-# for font embedding exception please see
-# http://www.gnu.org/licenses/gpl-faq.html#FontException
-License: GPLv2 with exceptions
-URL: http://wqy.sourceforge.net/en/
-Group: User Interface/X
-Source: http://downloads.sourceforge.net/wqy/%{fontname}-%{version}-cvs20081027.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-BuildRequires: mkfontdir
+%define fontname wqy-zenhei
+%define fontconf  44-%{fontname}.conf
+%define fontconf2 66-%{fontname}-sharp.conf
+
+Name:           %{fontname}-fonts
+Version:        0.8.34
+Release:        1.20081027cvs%{?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}-cvs20081027.tar.gz
+#Source1:        66-%{name}-sharp.conf
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+Requires:       fontpackages-filesystem
 
 %description
 The WenQuanYi Zen Hei is a Hei-Ti style (sans-serif)
-Chinese outline font. It was designed for general purpose text 
+Chinese outline font. It was designed for general purpose text
 formatting and on-screen display of Chinese characters among
-many other languages. The embolden strokes of the font glyphs 
-produces enhanced screen contrast, likely resulting in 
-improvement in reading speed and recognition. The embedded 
-bitmap glyphs further enhance on-screen performance, 
+many other languages. The embolden strokes of the font glyphs
+produces enhanced screen contrast, likely resulting in
+improvement in reading speed and recognition. The embedded
+bitmap glyphs further enhance on-screen performance,
 which could be enabled with the provided configuration files.
-WenQuanYi Zen Hei provides fairly complete coverage to Chinese 
-Hanzi glyphs including both simplified and traditional forms. 
-The total glyph number in this font is over 35,000, including over 
+WenQuanYi Zen Hei provides fairly complete coverage to Chinese
+Hanzi glyphs including both simplified and traditional forms.
+The total glyph number in this font is over 35,000, including over
 21,000 Chinese Hanzi. This font provides full coverage to
-GBK(CP936) charset, CJK Unified Ideographs, as well as the 
-code-points needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, 
+GBK(CP936) charset, CJK Unified Ideographs, as well as the
+code-points needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo,
 ja (Japanese) and ko (Korean) locales for fontconfig.
 
 %prep
 %setup -q -n %{fontname}
 
+
 %build
-%{nil}
+
 
 %install
-rm -rf %{buildroot}
-install -d -m755 %{buildroot}%{fontdir}
-install -d -m755 %{buildroot}%{fontconfdir}
-install -p -m644 *.ttc  %{buildroot}%{fontdir}/
-install -p -m644 44-%{fontname}.conf  %{buildroot}%{fontconfdir}/
-
-# Install catalogue symlink
-mkdir -p %{buildroot}%{catalogue}
-ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
+rm -fr %{buildroot}
+
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttc %{buildroot}%{_fontdir}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{fontconf} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+install -m 0644 -p %{fontconf2} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
+
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
-%{_bindir}/mkfontdir %{buildroot}%{fontdir}
 
 %clean
-rm -rf %{buildroot}
+rm -fr %{buildroot}
+
+
+%_font_pkg -f ??-%{fontname}*.conf *.ttc
 
-%files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%dir %{fontdir}
-%{fontdir}/*.ttc
-%{fontdir}/fonts.dir
-%config(noreplace) %{fontconfdir}/44-%{fontname}.conf
-%{catalogue}/%{name}
-
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{_datadir}/fonts
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache %{_datadir}/fonts
-  fi
-fi
+%dir %{_fontdir}
+
 
 %changelog
+*Tue Feb 10 2009 Qianqian Fang <fangqq at gmail.com> 0.8.34-1.20081027cvs
+- use fontpackages macros
+
 *Mon Oct 27 2008 Qianqian Fang <fangqq at gmail.com> 0.8.34-0.cvs20081027
 - upstream new version prelease
 
@@ -95,3 +91,4 @@
 
 *Thu Nov 1 2007 Qianqian Fang <fangqq at gmail.com> 0.2.16-0.1.20071031cvs
 - initial packaging for Fedora (# 361121)
+