rpms/bitmap-fonts/F-12 bitmap-fonts.spec,1.20,1.21
Pravin Satpute
pravins at fedoraproject.org
Wed Sep 30 07:26:47 UTC 2009
Author: pravins
Update of /cvs/pkgs/rpms/bitmap-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21578
Modified Files:
bitmap-fonts.spec
Log Message:
* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - 0.3-9
- updating as per new packaging guidelines
- bugfix 481068
Index: bitmap-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bitmap-fonts/F-12/bitmap-fonts.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bitmap-fonts.spec 24 Jul 2009 18:07:05 -0000 1.20
+++ bitmap-fonts.spec 30 Sep 2009 07:26:47 -0000 1.21
@@ -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 common
+Summary: Common files for bitmap-fonts
+Requires: fontpackages-filesystem
-%package cjk
+%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 at redhat.com> - 0.3-9
+- updating as per new packaging guidelines
+- bugfix 481068
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fonts-bugs
mailing list