rpms/wqy-bitmap-fonts/devel wqy-bitmap-fonts.spec,1.18,1.19

Qianqian Fang fangq at fedoraproject.org
Tue Feb 10 05:38:10 UTC 2009


Author: fangq

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

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


Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wqy-bitmap-fonts.spec	11 May 2008 18:45:23 -0000	1.18
+++ wqy-bitmap-fonts.spec	10 Feb 2009 05:37:40 -0000	1.19
@@ -1,25 +1,22 @@
-%define fontconfdir     %{_sysconfdir}/fonts/conf.d
-%define wqyroot         wqy-bitmapfont-gb18030
-%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.9.9
-Release: 6%{?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
-Source0: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-gb18030-%{version}-0.tar.gz
-Source1: 61-wqy-bitmapsong.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-BuildRequires: bdftopcf, mkfontdir
-Requires: fontconfig >= 2.3
-#Patch0: %{name}-%{version}-fix-mono.patch
+%define fontname  wqy-bitmap
+%define fontconf  61-wqy-bitmapsong.conf
+%define wqyroot   wqy-bitmapfont-gb18030
+
+Name:           %{fontname}-fonts
+Version:        0.9.9
+Release:        7%{?dist}
+Summary:        WenQuanYi Bitmap Chinese Fonts
+
+Group:          User Interface/X
+License:        GPLv2 with exceptions
+URL:            http://wenq.org/enindex.cgi
+Source0:        http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-gb18030-%{version}-0.tar.gz
+Source1: 	61-wqy-bitmapsong.conf
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+Requires:       fontpackages-filesystem
 
 %description
 The Wen Quan Yi bitmap font is a manually fine-tuned
@@ -39,54 +36,42 @@
 
 %prep
 %setup -q -n %{wqyroot}
-#%patch0 -p0
+
 
 %build
 make wqyv1
 
+
 %install
-rm -rf %{buildroot}
-install -d -m755 %{buildroot}%{wqyfontdir}
-install -d -m755 %{buildroot}%{fontdir}
-install -p -m644 *pt.pcf  %{buildroot}%{fontdir}/
-install -p -m644 fonts.alias  %{buildroot}%{fontdir}/
-install -d -m755 %{buildroot}%{fontconfdir}
-install -p -m644 %{SOURCE1}  %{buildroot}%{fontconfdir}/
-touch %{buildroot}%{fontdir}/fonts.dir
-
-# Install catalogue symlink
-mkdir -p %{buildroot}%{catalogue}/%{name}
-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}
+
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
-%{_bindir}/mkfontdir %{buildroot}%{fontdir}
 
 %clean
-rm -rf %{buildroot}
+rm -fr %{buildroot}
+
+
+%_font_pkg -f %{fontconf} *.pcf
 
-%files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README LOGO.png
-%dir %{wqyfontdir}
-%dir %{fontdir}
-%{fontdir}/*pt.pcf
-%config(noreplace) %{fontconfdir}/61-wqy-bitmapsong.conf
-%{fontdir}/fonts.alias
-%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> 0.9.9-7
+- use fontpackages macros
+
 *Tue May 11 2008 Qianqian Fang <fangqq at gmail.com> 0.9.9-6
 - remove bold font files, as Xft can do fake-emboldening byitself
 




More information about the fedora-extras-commits mailing list