rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.5,1.6

[Caius Chance]

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19293

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
revolves: rhbz#477332 (convert to new font packaging guidelines)



Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- baekmuk-ttf-fonts.spec	30 Jun 2008 06:11:03 -0000	1.5
+++ baekmuk-ttf-fonts.spec	9 Jan 2009 00:05:40 -0000	1.6
@@ -1,4 +1,8 @@
-%define fontname   baekmuk-ttf
+%define fontname    baekmuk-ttf
+%define fontconf    <65>-%{fontname}
+%define archivename %{name}-%{version}
+%define common_desc \
+This package provides the free Korean TrueType fonts.
 
 %define fontdir      %{_datadir}/fonts/%{fontname}
 %define cidmapdir      %{_datadir}/ghostscript/conf.d
@@ -6,7 +10,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -15,21 +19,26 @@
 Source0:        http://kldp.net/frs/download.php/1429/%{fontname}-%{version}.tar.gz
 Source1:        FAPIcidfmap.ko
 Source2:        cidfmap.ko
+
 Obsoletes:      fonts-korean
+
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  xorg-x11-font-utils, ttmkfdir >= 3.0.6
+BuildRequires:  fontpackages-devel, xorg-x11-font-utils, ttmkfdir >= 3.0.6
 
 %description
-This package provides the free Korean TrueType fonts.
+%common_desc
 
 %package common
 Summary:        Common files for Korean Baekmuk TrueType fonts
 License:        Baekmuk
 Group:          User Interface/X
+Requires:       fontpackages-filesystem
 Conflicts:      fonts-korean < 2.2-5
 
 %description common
+%common_desc
+
 This package contains some common files for Baekmuk Korean TrueType fonts.
 
 %define mk_pkg()\
@@ -38,9 +47,11 @@
 License:        Baekmuk\
 Group:          User Interface/X\
 Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6\
-Requires:       %{name}-common\
+Requires:       fontpackages-filesystem, %{name}-common\
 \
 %description %1\
+%common_desc\
+\
 This package contains the Korean TrueType font %2 typeface.\
 \
 %post %1\
@@ -75,35 +86,38 @@
 %{nil}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # for catalogue
-install -d $RPM_BUILD_ROOT%{catalogue}
+install -d %{buildroot}%{catalogue}
 
 for i in batang dotum gulim hline; do
-  install -d $RPM_BUILD_ROOT%{fontdir}-$i
-  install -p -m 0644 ttf/$i.ttf $RPM_BUILD_ROOT%{fontdir}-$i
-  ln -sf ../../..%{fontdir}-$i $RPM_BUILD_ROOT%{catalogue}/%{name}-$i
-  %{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{fontdir}-$i -o $RPM_BUILD_ROOT%{fontdir}-$i/fonts.scale
-  mkfontdir $RPM_BUILD_ROOT%{fontdir}-$i
+  install -d %{buildroot}%{fontdir}-$i
+  install -p -m 0644 ttf/$i.ttf %{buildroot}%{fontdir}-$i
+  ln -sf ../../..%{fontdir}-$i %{buildroot}%{catalogue}/%{name}-$i
+  %{_bindir}/ttmkfdir -d %{buildroot}%{fontdir}-$i -o %{buildroot}%{fontdir}-$i/fonts.scale
+  mkfontdir %{buildroot}%{fontdir}-$i
 done
 
 # for ghostscript
-install -d $RPM_BUILD_ROOT%{cidmapdir}
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{cidmapdir}/
-install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
+install -d %{buildroot}%{cidmapdir}
+install -p -m 0644 %{SOURCE1} %{buildroot}%{cidmapdir}/
+install -p -m 0644 %{SOURCE2} %{buildroot}%{cidmapdir}/
 
 # convert Korean copyright file to utf8
 iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files common
 %doc COPYRIGHT COPYRIGHT.ko README
 %{cidmapdir}/
 
 %changelog
+* Fri Jan 09 2009 Caius Chance <cchance at redhat.com> - 2.2-10.fc11
+- Resolves: rhbz#477332 (Convert to new font packaging guidelines.)
+
 * Mon Jun 30 2008 Caius Chance <cchance at redhat.com> - 2.2-9.fc10
 - Refine obsoletes tag version-release specific.