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

[Qianqian Fang (fangq)]

Author: fangq

Update of /cvs/extras/rpms/wqy-bitmap-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20398

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
drop chkfontpath dependence, use /etc/X11/fontpath.d instead



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wqy-bitmap-fonts.spec	21 May 2007 20:37:47 -0000	1.1
+++ wqy-bitmap-fonts.spec	16 Aug 2007 18:18:34 -0000	1.2
@@ -2,12 +2,12 @@
 %define wqyroot         wqy-bitmapfont-all
 %define wqyfontdir      %{_datadir}/fonts/wenquanyi
 %define fontdir         %{wqyfontdir}/bitmap
-
+%define catalogue       %{_sysconfdir}/X11/fontpath.d
 
 Name: wqy-bitmap-fonts
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
@@ -15,9 +15,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bdftopcf
-Requires: freetype, chkfontpath, xorg-x11-font-utils, fontconfig >= 2.3
-Requires(post): chkfontpath, xorg-x11-font-utils, fontconfig
-Requires(postun): chkfontpath, fontconfig
+Requires: freetype, xorg-x11-font-utils, fontconfig >= 2.3
+Requires(post): xorg-x11-font-utils, fontconfig
+Requires(postun): fontconfig
 
 %description
 The Wen Quan Yi bitmap fonts include complete CJK Unified
@@ -48,6 +48,8 @@
 install -d -m755 %{buildroot}%{fontconfdir}
 install -p -m644 85-wqy-bitmapsong.conf  %{buildroot}%{fontconfdir}/
 touch %{buildroot}%{fontdir}/fonts.dir
+# Install catalogue symlink
+ln -sf %{buildroot}%{fontdir} ${buildroot}%{catalogue}/%{name}
 
 %clean
 rm -rf %{buildroot}
@@ -61,19 +63,22 @@
 %config(noreplace) %{fontconfdir}/85-wqy-bitmapsong.conf
 %{fontdir}/fonts.alias
 %ghost %verify(not md5 size mtime) %{fontdir}/fonts.dir
+%{catalogue}/fonts-default
 
 %post
 %{_bindir}/mkfontdir %{fontdir} || :
 %{_bindir}/fc-cache  %{fontdir} || :
-%{_sbindir}/chkfontpath -q -a %{fontdir} || :
 
 %postun
 if [ "$1" = "0" ]; then
-    %{_sbindir}/chkfontpath -q -r %{fontdir} || :
+    unlink ${buildroot}%{catalogue}/%{name}||:
 fi
 %{_bindir}/fc-cache || :
 
 %changelog
+*Thu Aug 16 2007 Qianqian Fang <fangqq at gmail.com> 0.8.1-7
+- drop chkfontpath from the spec file, use fontpath.d instead
+
 *Fri May 18 2007 Qianqian Fang <fangqq at gmail.com> 0.8.1-6
 - final polishing of spec file and initial upload to cvs