rpms/wqy-bitmap-fonts/devel wqy-bitmap-fonts.spec,1.4,1.5

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
- fix font catalogue symlink (#252279)
- drop fontconfig and xorg-x11-font-utils requires for scripts
- drop freetype and xorg-x11-font-utils requires
- run mkfontdir at buildtime
- use the standard font scriptlets



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wqy-bitmap-fonts.spec	16 Aug 2007 19:22:55 -0000	1.4
+++ wqy-bitmap-fonts.spec	28 Aug 2007 03:15:14 -0000	1.5
@@ -7,17 +7,15 @@
 Name: wqy-bitmap-fonts
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-BuildRequires: bdftopcf
-Requires: freetype, xorg-x11-font-utils, fontconfig >= 2.3
-Requires(post): xorg-x11-font-utils, fontconfig
-Requires(postun): fontconfig
+BuildRequires: bdftopcf, mkfontdir
+Requires: fontconfig >= 2.3
 
 %description
 The Wen Quan Yi bitmap fonts include complete CJK Unified
@@ -48,8 +46,12 @@
 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}
+mkdir -p %{buildroot}%{catalogue}/%{name}
+ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
+
+%{_bindir}/mkfontdir %{buildroot}%{fontdir}
 
 %clean
 rm -rf %{buildroot}
@@ -62,22 +64,31 @@
 %{fontdir}/*.pcf
 %config(noreplace) %{fontconfdir}/85-wqy-bitmapsong.conf
 %{fontdir}/fonts.alias
-%ghost %verify(not md5 size mtime) %{fontdir}/fonts.dir
-%{catalogue}/fonts-default
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%{catalogue}/%{name}
 
 %post
-%{_bindir}/mkfontdir %{fontdir} || :
-%{_bindir}/fc-cache  %{fontdir} || :
+if [ -x %{_bindir}/fc-cache ]; then
+  %{_bindir}/fc-cache %{_datadir}/fonts
+fi
 
 %postun
 if [ "$1" = "0" ]; then
-    unlink %{buildroot}%{catalogue}/%{name}||:
+  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{_datadir}/fonts
+  fi
 fi
-%{_bindir}/fc-cache || :
 
 %changelog
+* Tue Aug 28 2007 Jens Petersen <petersen at redhat.com> - 0.8.1-8
+- fix font catalogue symlink (#252279)
+- drop fontconfig and xorg-x11-font-utils requires for scripts
+- drop freetype and xorg-x11-font-utils requires
+- run mkfontdir at buildtime
+- use the standard font scriptlets
+
 *Thu Aug 16 2007 Qianqian Fang <fangqq at gmail.com> 0.8.1-7
-- drop chkfontpath from the spec file, use fontpath.d instead
+- drop chkfontpath from the spec file, use fontpath.d instead (#252279)
 
 *Fri May 18 2007 Qianqian Fang <fangqq at gmail.com> 0.8.1-6
 - final polishing of spec file and initial upload to cvs