From 44507476e44d3b59ffef0f9afeadc62ef57f20bf Mon Sep 17 00:00:00 2001
From: Pravin Satpute <pravins@fedoraproject.org>
Date: Wed, 30 Sep 2009 07:36:13 +0000
Subject: [PATCH] - updating as per new packaging guidelines - bugfix 481068

---
 bitmap-fonts.spec | 72 ++++++++++++++++++++++++-----------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/bitmap-fonts.spec b/bitmap-fonts.spec
index 7531899..95a10f8 100644
--- a/bitmap-fonts.spec
+++ b/bitmap-fonts.spec
@@ -1,6 +1,12 @@
+#%global fontname bitmap
+%define common_desc \
+The bitmap-fonts package provides a number of bitmap fonts selected\
+from the xorg package designed for use locations such as\
+terminals.
+
 Name: bitmap-fonts
 Version: 0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Lucida and MIT and Public Domain
 Source0: bitmap-fonts-%{version}.tar.bz2
 Source1: fixfont-3.5.tar.bz2
@@ -10,25 +16,40 @@ Group: User Interface/X
 Summary: Selected set of bitmap fonts
 Requires(pre): fontconfig
 BuildRequires: xorg-x11-font-utils
+BuildRequires: fontpackages-devel
 
 %description
-The bitmap-fonts package provides a number of bitmap fonts selected
-from the xorg package designed for use locations such as
-terminals.
+%common_desc
 
-%package cjk
+%package common
+Summary:  Common files for bitmap-fonts
+Requires: fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
+
+%_font_pkg  lut* con* [0-9]*
+
+%package -n bitmap-cjk-fonts
 Summary: Selected CJK bitmap fonts for Anaconda
 Group: Applications/System
 Requires(pre): fontconfig
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-cjk = %{version}-%{release}
 
-%description cjk
+%description -n %{fontname}-cjk-fonts
 bitmap-fonts-cjk package contains bitmap fonts used by Anaconda. They are
 selected from the xorg packages, and the font encoding are converted from 
 native encoding to ISO10646. They are only intended to be used in Anaconda.
 
+%_font_pkg -n cjk fangsongti*
+
 %prep
 %setup -q -a 1
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -38,44 +59,25 @@ cd fixfont-3.5
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT/usr/share/fonts/bitmap-fonts %{buildroot}%{_fontdir}
+
+#install -m 0755 -d %{buildroot}%{_fontdir}
+
 # %%ghost the fonts.cache-1 file
-touch $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/fonts.cache-1
+#touch $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/fonts.cache-1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-fc-cache %{_datadir}/fonts
-
-%postun
-if [ "$1" = "0" ]; then
-  fc-cache %{_datadir}/fonts
-fi
-
-%post cjk
-fc-cache %{_datadir}/fonts
-
-%postun cjk
-if [ "$1" = "0" ]; then
-  fc-cache %{_datadir}/fonts
-fi
-
-%files
+%files common
 %defattr(-,root,root)
 %doc README LU_LEGALNOTICE
-%dir %{_datadir}/fonts/bitmap-fonts
-%{_datadir}/fonts/bitmap-fonts/lut*
-%{_datadir}/fonts/bitmap-fonts/con*
-%{_datadir}/fonts/bitmap-fonts/[0-9]*
-%ghost %{_datadir}/fonts/bitmap-fonts/fonts.cache-1
-
-%files cjk
-%defattr(-,root,root)
-%dir %{_datadir}/fonts/bitmap-fonts
-%{_datadir}/fonts/bitmap-fonts/fangsongti*
-%ghost %{_datadir}/fonts/bitmap-fonts/fonts.cache-1
 
 %changelog
+* Wed Sep 30 2009 Pravin Satpute <psatpute@redhat.com> - 0.3-9
+- updating as per new packaging guidelines
+- bugfix 481068
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild