rpms/wqy-unibit-fonts/devel wqy-unibit-fonts.spec,1.1,1.2

[Qianqian Fang]

Author: fangq

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

Modified Files:
	wqy-unibit-fonts.spec 
Log Message:
use fontpackages macros


Index: wqy-unibit-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-unibit-fonts/devel/wqy-unibit-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wqy-unibit-fonts.spec	4 Oct 2007 01:45:36 -0000	1.1
+++ wqy-unibit-fonts.spec	10 Feb 2009 07:00:18 -0000	1.2
@@ -1,19 +1,19 @@
-%define fontdir         %{_datadir}/fonts/wenquanyi-unibit
-%define catalogue       %{_sysconfdir}/X11/fontpath.d
+%define fontname wqy-unibit
 
-Name: wqy-unibit-fonts
-Summary: WenQuanYi Unibit Bitmap Font
-Version: 1.1.0
-Release: 4%{?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/wqy-unibit-bdf-%{version}-1.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-BuildRequires: bdftopcf, mkfontdir
+Name:           %{fontname}-fonts
+Version:        1.1.0
+Release:        5%{?dist}
+Summary:        WenQuanYi Unibit Bitmap Font
+
+Group:          User Interface/X
+License:        GPLv2 with exceptions
+URL:            http://wenq.org/enindex.cgi
+Source0:        http://downloads.sourceforge.net/wqy/wqy-unibit-bdf-%{version}-1.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel, bdftopcf
+Requires:       fontpackages-filesystem
 
 %description
 The Wen Quan Yi Unibit is designed as a dual-width (16x16,16x8) 
@@ -34,46 +34,36 @@
 http://wenq.org/eindex.cgi?Unicode_Chart_EN
 
 %prep
-%setup -q -n wqy-unibit
+%setup -q -n %{fontname}
+
 
 %build
 make
 
 %install
-rm -rf %{buildroot}
-install -d -m755 %{buildroot}%{fontdir}
-install -p -m644 *.pcf  %{buildroot}%{fontdir}/
-
-# 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 *.pcf %{buildroot}%{_fontdir}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-%{_bindir}/mkfontdir %{buildroot}%{fontdir}
 
 %clean
-rm -rf %{buildroot}
+rm -fr %{buildroot}
+
+
+%_font_pkg *.pcf
 
-%files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%dir %{fontdir}
-%{fontdir}/*.pcf
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%{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> 1.1.0-5
+- use fontpackages macro
+
 *Sun Sep 30 2007 Qianqian Fang <fangqq at gmail.com> 1.1.0-4
 - more spec file clean up