rpms/baekmuk-ttf-fonts/devel 65-baekmuk-ttf-batang.conf, NONE, 1.1 65-baekmuk-ttf-dotum.conf, NONE, 1.1 65-baekmuk-ttf-gulim.conf, NONE, 1.1 65-baekmuk-ttf-hline.conf, NONE, 1.1 baekmuk-ttf-fonts.spec, 1.6, 1.7
Caius Chance
cchance at fedoraproject.org
Fri Jan 16 02:43:25 UTC 2009
Author: cchance
Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29418
Modified Files:
baekmuk-ttf-fonts.spec
Added Files:
65-baekmuk-ttf-batang.conf 65-baekmuk-ttf-dotum.conf
65-baekmuk-ttf-gulim.conf 65-baekmuk-ttf-hline.conf
Log Message:
* Fri Jan 16 2009 Caius Chance <cchance at redhat.com> - 2.2-11.fc11
- Resolves: rhbz#477332 (Include macro _font_pkg and created fontconfig .conf files.)
--- NEW FILE 65-baekmuk-ttf-batang.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
Serif faces
-->
<alias>
<family>Baekmuk Batang</family>
<default>
<family>serif</family>
</default>
</alias>
<alias>
<family>serif</family>
<prefer>
<family>Baekmuk Batang</family>
</prefer>
</alias>
</fontconfig>
--- NEW FILE 65-baekmuk-ttf-dotum.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
Sans-serif faces
-->
<alias>
<family>Baekmuk Dotum</family>
<default>
<family>sans-serif</family>
</default>
</alias>
<alias>
<family>sans-serif</family>
<prefer>
<family>Baekmuk Dotum</family>
</prefer>
</alias>
</fontconfig>
--- NEW FILE 65-baekmuk-ttf-gulim.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
monospace faces
-->
<alias>
<family>Baekmuk Gulim</family>
<default>
<family>monospace</family>
</default>
</alias>
<alias>
<family>monospace</family>
<prefer>
<family>Baekmuk Gulim</family>
</prefer>
</alias>
</fontconfig>
--- NEW FILE 65-baekmuk-ttf-hline.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
this conf file is intended empty
-->
</fontconfig>
Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- baekmuk-ttf-fonts.spec 9 Jan 2009 00:05:40 -0000 1.6
+++ baekmuk-ttf-fonts.spec 16 Jan 2009 02:42:55 -0000 1.7
@@ -1,24 +1,27 @@
%define fontname baekmuk-ttf
-%define fontconf <65>-%{fontname}
-%define archivename %{name}-%{version}
+%define archivename %{fontname}-%{version}
%define common_desc \
This package provides the free Korean TrueType fonts.
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define cidmapdir %{_datadir}/ghostscript/conf.d
+%define fontdir %{_datadir}/fonts/%{fontname}
+%define gsdir %{_datadir}/ghostscript/conf.d
%define catalogue %{_sysconfdir}/X11/fontpath.d
Name: %{fontname}-fonts
Version: 2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Free Korean TrueType fonts
Group: User Interface/X
License: Baekmuk
URL: http://kldp.net/projects/baekmuk/
-Source0: http://kldp.net/frs/download.php/1429/%{fontname}-%{version}.tar.gz
+Source0: http://kldp.net/frs/download.php/1429/%{archivename}.tar.gz
Source1: FAPIcidfmap.ko
Source2: cidfmap.ko
+Source3: 65-baekmuk-ttf-batang.conf
+Source4: 65-baekmuk-ttf-dotum.conf
+Source5: 65-baekmuk-ttf-gulim.conf
+Source6: 65-baekmuk-ttf-hline.conf
Obsoletes: fonts-korean
@@ -41,80 +44,133 @@
This package contains some common files for Baekmuk Korean TrueType fonts.
-%define mk_pkg()\
-%package %1\
-Summary: Korean Baekmuk TrueType %2 typeface\
-License: Baekmuk\
-Group: User Interface/X\
-Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6\
-Requires: fontpackages-filesystem, %{name}-common\
-\
-%description %1\
-%common_desc\
-\
-This package contains the Korean TrueType font %2 typeface.\
-\
-%post %1\
-if [ -x %{_bindir}/fc-cache ]; then\
- %{_bindir}/fc-cache %{_datadir}/fonts\
-fi\
-\
-%postun %1\
-if [ "$1" = "0" ]; then\
- if [ -x %{_bindir}/fc-cache ]; then\
- %{_bindir}/fc-cache %{_datadir}/fonts\
- fi\
-fi\
-\
-%files %1\
-%defattr(-,root,root,-)\
-%dir %{fontdir}-%1\
-%{fontdir}-%1/*.ttf\
-%verify(not md5 size mtime) %{fontdir}-%1/fonts.dir\
-%verify(not md5 size mtime) %{fontdir}-%1/fonts.scale\
-%{catalogue}/%{name}-%1
-
-%mk_pkg batang Batang
-%mk_pkg dotum Dotum
-%mk_pkg gulim Gulim
-%mk_pkg hline Headline
+%package batang
+Summary: Korean Baekmuk TrueType Batang typeface
+License: Baekmuk
+Group: User Interface/X
+Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
+Requires: fontpackages-filesystem, %{name}-common
+
+%description batang
+%common_desc
+
+This package contains the Korean TrueType font Batang typeface.
+
+%_font_pkg -n batang -f *-%{fontname}-batang*.conf batang.ttf
+
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{catalogue}/%{fontname}
+
+%package dotum
+Summary: Korean Baekmuk TrueType Dotum typeface
+License: Baekmuk
+Group: User Interface/X
+Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
+Requires: fontpackages-filesystem, %{name}-common
+
+%description dotum
+%common_desc
+
+This package contains the Korean TrueType font Dotum typeface.
+
+%_font_pkg -n dotum -f *-%{fontname}-dotum*.conf dotum.ttf
+
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{catalogue}/%{fontname}
+
+%package gulim
+Summary: Korean Baekmuk TrueType Gulim typeface
+License: Baekmuk
+Group: User Interface/X
+Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
+Requires: fontpackages-filesystem, %{name}-common
+
+%description gulim
+%common_desc
+
+This package contains the Korean TrueType font Gulim typeface.
+
+%_font_pkg -n gulim -f *-%{fontname}-gulim*.conf gulim.ttf
+
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{catalogue}/%{fontname}
+
+%package hline
+Summary: Korean Baekmuk TrueType Headline typeface
+License: Baekmuk
+Group: User Interface/X
+Obsoletes: ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
+Requires: fontpackages-filesystem, %{name}-common
+
+%description hline
+%common_desc
+
+This package contains the Korean TrueType font Headline typeface.
+
+%_font_pkg -n hline -f *-%{fontname}-hline*.conf hline.ttf
+
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{catalogue}/%{fontname}
%prep
-%setup -q -n %{fontname}-%{version}
+%setup -q -n %{archivename}
%build
%{nil}
%install
-rm -rf %{buildroot}
-
-# for catalogue
-install -d %{buildroot}%{catalogue}
+%__rm -rf %{buildroot}
+# font
+%__install -d -m 0755 %{buildroot}%{fontdir}
for i in batang dotum gulim hline; do
- 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
+ %__install -p -m 0644 ttf/$i.ttf %{buildroot}%{fontdir}
+done
+
+# fontconfig conf
+%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
+%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
+cd ../
+for fconf in `ls *-%{fontname}-*.conf`
+do
+ %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
+ %__ln_s %{_fontconfig_templatedir}/$fconf \
+ %{buildroot}%{_fontconfig_confdir}/$fconf
done
+cd -
-# for ghostscript
-install -d %{buildroot}%{cidmapdir}
-install -p -m 0644 %{SOURCE1} %{buildroot}%{cidmapdir}/
-install -p -m 0644 %{SOURCE2} %{buildroot}%{cidmapdir}/
+# fonts.{scale,dir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{fontdir} \
+ -o %{buildroot}%{fontdir}/fonts.scale
+%{_bindir}/mkfontdir %{buildroot}%{fontdir}
+
+# ghostscript
+%__install -d -m 0755 %{buildroot}%{gsdir}
+%__install -p -m 0644 %{SOURCE1} %{buildroot}%{gsdir}/
+%__install -p -m 0644 %{SOURCE2} %{buildroot}%{gsdir}/
+
+# catalogue
+%__install -d %{buildroot}%{catalogue}
+%__ln_s %{fontdir} %{buildroot}%{catalogue}/%{fontname}
# convert Korean copyright file to utf8
-iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko
+%{_bindir}/iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko
%clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
%files common
%doc COPYRIGHT COPYRIGHT.ko README
-%{cidmapdir}/
+%{gsdir}/
%changelog
+* Fri Jan 16 2009 Caius Chance <cchance at redhat.com> - 2.2-11.fc11
+- Resolves: rhbz#477332 (Include macro _font_pkg and created fontconfig .conf files.)
+
* Fri Jan 09 2009 Caius Chance <cchance at redhat.com> - 2.2-10.fc11
- Resolves: rhbz#477332 (Convert to new font packaging guidelines.)
More information about the fonts-bugs
mailing list