rpms/japanese-bitmap-fonts/devel japanese-bitmap-fonts.spec, 1.5, 1.6

[Akira TAGOH]

Author: tagoh

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

Modified Files:
	japanese-bitmap-fonts.spec 
Log Message:
* Fri Mar 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.20080710-5
- Clean up a spec file.
- Rebuilt (#491963)


Index: japanese-bitmap-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/japanese-bitmap-fonts/devel/japanese-bitmap-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- japanese-bitmap-fonts.spec	25 Feb 2009 08:56:52 -0000	1.5
+++ japanese-bitmap-fonts.spec	27 Mar 2009 11:54:10 -0000	1.6
@@ -1,5 +1,4 @@
-%define fontname        %{name}
-%define fontdir         %{_datadir}/fonts/%{fontname}
+%global	fontname        japanese-bitmap
 %define cataloguedir    %{_sysconfdir}/X11/fontpath.d
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
 
@@ -14,14 +13,14 @@
 %define mplus           mplus_bitmap_fonts-2.2.4
 %define vft             vine-fonttools-0.1
 
-Name:           japanese-bitmap-fonts
+Name:           %{fontname}-fonts
 Version:        0.20080710
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        Public Domain and BSD and mplus
 Group:          User Interface/X
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:  xorg-x11-font-utils mkfontdir gawk
+BuildRequires:  xorg-x11-font-utils mkfontdir gawk fontpackages-devel
 
 ## files in ttfonts-ja
 Source2:        FAPIcidfmap.ja
@@ -90,6 +89,7 @@
 
 Summary:        Free Japanese Bitmap fonts
 
+Requires:	fontpackages-filesystem
 Provides:	jisksp14 = 0.1-16, kappa20 = 0.3-15, fonts-ja = 8.0-16, fonts-japanese = 0.20061016-13
 Obsoletes:	jisksp14 <= 0.1-16, kappa20 <= 0.3-15, fonts-ja <= 8.0-16, fonts-japanese <= 0.20061016-13
 
@@ -286,24 +286,24 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{fontdir}
-install -d $RPM_BUILD_ROOT%{cidmapdir}
+install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
+install -m 0755 -d $RPM_BUILD_ROOT%{cidmapdir}
 
 ## jisksp14
-install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{fontdir}/
+install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{_fontdir}/
 
 ## kappa20
 
 ## knm_new
 for i in knmhn12x.bdf fonts/kaname-latin1.bdf fonts/knm12p.bdf fonts/knm12pb.bdf fonts/knmzn12x.bdf fonts/knmzn12xb.bdf; do
-    bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{fontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'`
+    bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{_fontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'`
 done
 
 ## fonts-ja
 ### remove an unnecessary file
 rm -f fonts-ja/mplus_cursors.pcf.gz
 for i in fonts-ja/*.pcf.gz; do
-    install -m 0644 -p $i $RPM_BUILD_ROOT%{fontdir}/`basename $i`
+    install -m 0644 -p $i $RPM_BUILD_ROOT%{_fontdir}/`basename $i`
 done
 
 # for ghostscript
@@ -312,49 +312,37 @@
 install -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
 
 # Create fonts.scale and fonts.dir
-/usr/bin/mkfontdir $RPM_BUILD_ROOT%{fontdir}
+/usr/bin/mkfontdir $RPM_BUILD_ROOT%{_fontdir}
 # for dummy
-touch $RPM_BUILD_ROOT%{fontdir}/encodings.dir
+touch $RPM_BUILD_ROOT%{_fontdir}/encodings.dir
 
-install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{fontdir}/
+install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{_fontdir}/
 
 # Install catalogue symlink
-install -d $RPM_BUILD_ROOT%{cataloguedir}
-ln -sf %{fontdir} $RPM_BUILD_ROOT%{cataloguedir}/%{name}
+install -m 0755 -d $RPM_BUILD_ROOT%{cataloguedir}
+ln -sf %{_fontdir} $RPM_BUILD_ROOT%{cataloguedir}/%{fontname}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-umask 133
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-%postun
-umask 133
-if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache %{fontdir} || :
-  fi
-fi
+%_font_pkg *.pcf.gz
 
-%files
-%defattr(0644, root, root, 0755)
 %doc doc.orig readme.kaname_bdf
 %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt
-%dir %{fontdir}
 %dir %{cidmapdir}
-%verify(not md5 size mtime) %{fontdir}/fonts.alias
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{fontdir}/encodings.dir
-%{fontdir}/*gz
+%verify(not md5 size mtime) %{_fontdir}/fonts.alias
+%verify(not md5 size mtime) %{_fontdir}/fonts.dir
+%ghost %verify(not md5 size mtime) %{_fontdir}/encodings.dir
 %{cidmapdir}/FAPIcidfmap.ja
 %{cidmapdir}/cidfmap.ja
 %{cidmapdir}/CIDFnmap.ja
 %{cataloguedir}/*
 
 %changelog
+* Fri Mar 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.20080710-5
+- Clean up a spec file.
+- Rebuilt (#491963)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20080710-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild