Author: tagoh
Update of /cvs/pkgs/rpms/sazanami-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2826
Modified Files:
sazanami-fonts.spec
Added Files:
sazanami-gothic-fontconfig.conf
sazanami-mincho-fontconfig.conf
Log Message:
* Thu Dec 25 2008 Akira TAGOH <ta...@redhat.com> - 0.20040629-5.20061016
- Update the spec file to fit into new guideline. (#477453)
--- NEW FILE sazanami-gothic-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
<test name="lang">
<string>ja-jp</string>
</test>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend" binding="same">
<string>Sazanami Gothic</string>
</edit>
</match>
<alias>
<family>Sazanami Gothic</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>
--- NEW FILE sazanami-mincho-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
<test name="lang">
<string>ja-jp</string>
</test>
<test name="family">
<string>serif</string>
</test>
<edit name="family" mode="prepend" binding="same">
<string>Sazanami Mincho</string>
</edit>
</match>
<alias>
<family>Sazanami Mincho</family>
<default>
<family>serif</family>
</default>
</alias>
</fontconfig>
Index: sazanami-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sazanami-fonts/devel/sazanami-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sazanami-fonts.spec 28 Aug 2007 06:20:56 -0000 1.3
+++ sazanami-fonts.spec 25 Dec 2008 05:59:47 -0000 1.4
@@ -1,15 +1,21 @@
-%define gothfontdir %{_datadir}/fonts/%{name}-gothic
-%define minfontdir %{_datadir}/fonts/%{name}-mincho
-%define catalogue %{_sysconfdir}/X11/fontpath.d
%define fontver 20061016
+%define priority 66
+%define fontname sazanami
+%define archivename %{fontname}-%{fontver}
+%define fontconf %{priority}-%{fontname}
+%define catalogue %{_sysconfdir}/X11/fontpath.d
+%define common_desc \
+The Sazanami type faces are automatically generated from Wadalab font kit.\
+They also contains some embedded Japanese bitmap fonts.
-Name: sazanami-fonts
+Name: %{fontname}-fonts
Version: 0.20040629
-Release: 4.%{fontver}%{?dist}
+Release: 5.%{fontver}%{?dist}
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ttmkfdir >= 3.0.6
BuildRequires: mkfontdir
+BuildRequires: fontpackages-devel
URL: http://efont.sourceforge.jp/
# original is
http://prdownloads.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2
@@ -17,6 +23,8 @@
Source0: sazanami-%{fontver}.tar.bz2
Source1: fonts.alias.sazanami-gothic
Source2: fonts.alias.sazanami-mincho
+Source3: %{fontname}-gothic-fontconfig.conf
+Source4: %{fontname}-mincho-fontconfig.conf
Summary: Sazanami Japanese TrueType fonts
@@ -24,36 +32,45 @@
Group: User Interface/X
%description
-The Sazanami type faces are automatically generated from Wadalab font kit.
-They also contains some embedded Japanese bitmap fonts.
+%common_desc
+
+%package common
+Summary: Common files for Sazanami Japanese TrueType fonts
+Group: User Interface/X
+Requires: fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
-%package gothic
+%package gothic
Summary: Sazanami Gothic Japanese TrueType font
License: BSD
Group: User Interface/X
Conflicts: fonts-japanese <= 0.20061016-9.fc8
Provides: ttfonts-ja = 1.2-37
Obsoletes: ttfonts-ja < 1.2-37
+Requires: %{name}-common = %{version}-%{release}
-%description gothic
-This package contains Japanese TrueType font for Gothic type face.
+%description gothic
+%common_desc
-The Sazanami type faces are automatically generated from Wadalab font kit.
-They also contains some embedded Japanese bitmap fonts.
+This package contains Japanese TrueType font for Gothic type face.
-%package mincho
+%package mincho
Summary: Sazanami Mincho Japanese TrueType font
License: BSD
Group: User Interface/X
Conflicts: fonts-japanese <= 0.20061016-9.fc8
Provides: ttfonts-ja = 1.2-37
Obsoletes: ttfonts-ja < 1.2-37
+Requires: %{name}-common = %{version}-%{release}
-%description mincho
-This package contains Japanese TrueType font for Mincho type face.
+%description mincho
+%common_desc
-The Sazanami type faces are automatically generated from Wadalab font kit.
-They also contains some embedded Japanese bitmap fonts.
+This package contains Japanese TrueType font for Mincho type face.
%prep
%setup -q -n sazanami-%{fontver}
@@ -63,74 +80,62 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{gothfontdir}
-install -d $RPM_BUILD_ROOT%{minfontdir}
-install -d $RPM_BUILD_ROOT%{catalogue}
-
-install -p -m 0644 sazanami-gothic.ttf $RPM_BUILD_ROOT%{gothfontdir}/
-install -p -m 0644 sazanami-mincho.ttf $RPM_BUILD_ROOT%{minfontdir}/
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{gothfontdir}/fonts.alias
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{minfontdir}/fonts.alias
+install -dm 0755 $RPM_BUILD_ROOT%{_fontdir}/{gothic,mincho}
+install -pm 0644 sazanami-gothic.ttf $RPM_BUILD_ROOT%{_fontdir}/gothic
+install -pm 0644 sazanami-mincho.ttf $RPM_BUILD_ROOT%{_fontdir}/mincho
+
+install -dm 0755 $RPM_BUILD_ROOT%{_fontconfig_templatedir} \
+ $RPM_BUILD_ROOT%{_fontconfig_confdir}
+install -pm 0644 %{SOURCE3}
$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}-gothic.conf
+install -pm 0644 %{SOURCE4}
$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}-mincho.conf
+
+for fontconf in %{fontconf}-gothic.conf %{fontconf}-mincho.conf; do
+ ln -s %{_fontconfig_templatedir}/$fontconf
$RPM_BUILD_ROOT%{_fontconfig_confdir}/$fontconf
+done
+
+install -dm 0755 $RPM_BUILD_ROOT%{catalogue}
+install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_fontdir}/gothic/fonts.alias
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_fontdir}/mincho/fonts.alias
# Create fonts.scale and fonts.dir
-%{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{gothfontdir} -o
$RPM_BUILD_ROOT%{gothfontdir}/fonts.scale
-%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{gothfontdir}
-%{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{minfontdir} -o
$RPM_BUILD_ROOT%{minfontdir}/fonts.scale
-%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{minfontdir}
+%{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{_fontdir}/gothic -o
$RPM_BUILD_ROOT%{_fontdir}/gothic/fonts.scale
+%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{_fontdir}/gothic
+%{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{_fontdir}/mincho -o
$RPM_BUILD_ROOT%{_fontdir}/mincho/fonts.scale
+%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{_fontdir}/mincho
# Install catalogue symlink
-ln -sf %{gothfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-gothic
-ln -sf %{minfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-mincho
+ln -sf %{_fontdir}/gothic $RPM_BUILD_ROOT%{catalogue}/%{name}-gothic
+ln -sf %{_fontdir}/mincho $RPM_BUILD_ROOT%{catalogue}/%{name}-mincho
%clean
rm -rf $RPM_BUILD_ROOT
-%post gothic
-if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{gothfontdir}
-fi
-
-%postun gothic
-if [ "$1" = "0" ]; then
- if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{_datadir}/fonts
- fi
-fi
-
-%post mincho
-if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{minfontdir}
-fi
-
-%postun mincho
-if [ "$1" = "0" ]; then
- if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{_datadir}/fonts
- fi
-fi
+%_font_pkg -n gothic -f %{fontconf}-gothic.conf gothic/sazanami-gothic.ttf
-%files gothic
-%defattr(-, root, root, -)
-%doc doc README
-%dir %{gothfontdir}
-%{gothfontdir}/*.ttf
-%verify(not md5 size mtime) %{gothfontdir}/fonts.dir
-%verify(not md5 size mtime) %{gothfontdir}/fonts.scale
-%verify(not md5 size mtime) %{gothfontdir}/fonts.alias
+%dir %{_fontdir}/gothic
%{catalogue}/%{name}-gothic
+%verify(not md5 size mtime) %{_fontdir}/gothic/fonts.dir
+%verify(not md5 size mtime) %{_fontdir}/gothic/fonts.scale
+%verify(not md5 size mtime) %{_fontdir}/gothic/fonts.alias
-%files mincho
-%defattr(-, root, root, -)
-%doc doc README
-%dir %{minfontdir}
-%{minfontdir}/*.ttf
-%verify(not md5 size mtime) %{minfontdir}/fonts.dir
-%verify(not md5 size mtime) %{minfontdir}/fonts.scale
-%verify(not md5 size mtime) %{minfontdir}/fonts.alias
+%_font_pkg -n mincho -f %{fontconf}-mincho.conf mincho/sazanami-mincho.ttf
+
+%dir %{_fontdir}/mincho
%{catalogue}/%{name}-mincho
+%verify(not md5 size mtime) %{_fontdir}/mincho/fonts.dir
+%verify(not md5 size mtime) %{_fontdir}/mincho/fonts.scale
+%verify(not md5 size mtime) %{_fontdir}/mincho/fonts.alias
+
+%files common
+%defattr(0644, root, root, 0755)
+%doc doc README
+%dir %{_fontdir}
%changelog
+* Thu Dec 25 2008 Akira TAGOH <ta...@redhat.com> - 0.20040629-5.20061016
+- Update the spec file to fit into new guideline. (#477453)
+
* Tue Aug 28 2007 Jens Petersen <peter...@redhat.com> - 0.20040629-4.20061016
- use the standard font scriptlets (#259041)
_______________________________________________
Fedora-fonts-bugs-list mailing list
Fedora-fonts-bugs-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list
