rpms/hanazono-fonts/devel hanazono-fonts.spec,1.1,1.2

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/hanazono-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29102

Modified Files:
	hanazono-fonts.spec 
Log Message:
* Wed Dec 24 2008 Akira TAGOH <tagoh at redhat.com> - 20081012-6
- Update the spec file to fit into new guideline. (#477395)


Index: hanazono-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hanazono-fonts/devel/hanazono-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hanazono-fonts.spec	17 Nov 2008 02:23:06 -0000	1.1
+++ hanazono-fonts.spec	24 Dec 2008 12:31:13 -0000	1.2
@@ -1,12 +1,11 @@
 %define	fontname	hanazono
-%define	fontdir		%{_datadir}/fonts/%{fontname}
-%define	fontconfdir	%{_sysconfdir}/fonts/conf.d
 %define archivename	%{fontname}-%{version}
 %define	priority	66
+%define fontconf	%{priority}-%{fontname}.conf
 
 Name:		%{fontname}-fonts
 Version:	20081012
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Japanese Mincho-typeface TrueType font
 
 Group:		User Interface/X
@@ -17,6 +16,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
+BuildRequires:	fontpackages-devel
+Requires:	fontpackages-filesystem
 
 %description
 Hanazono Mincho typeface is a Japanese TrueType font that developed with
@@ -44,36 +45,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -dm 0755 $RPM_BUILD_ROOT%{fontdir}
-install -pm 0644 hanazono.ttf $RPM_BUILD_ROOT%{fontdir}
-install -dm 0755 $RPM_BUILD_ROOT%{fontconfdir}
-install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/%{priority}-%{fontname}.conf
+install -dm 0755 $RPM_BUILD_ROOT%{_fontdir}
+install -pm 0644 hanazono.ttf $RPM_BUILD_ROOT%{_fontdir}
+install -dm 0755 $RPM_BUILD_ROOT%{_fontconfig_templatedir} \
+		 $RPM_BUILD_ROOT%{_fontconfig_confdir}
+install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}
 
+ln -s %{_fontconfig_templatedir}/%{fontconf} $RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-	%{_bindir}/fc-cache %{fontdir} || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ]; then
-	%{_bindir}/fc-cache %{fontdir} || :
-fi
+%_font_pkg -f %{fontconf} hanazono.ttf
 
-
-%files
-%defattr(0644, root, root, 0755)
 %doc LISENCE.txt README.txt THANKS.txt
-%config(noreplace) %{fontconfdir}/%{priority}-%{fontname}.conf
-%dir %{fontdir}/
-%{fontdir}/*.ttf
+%dir %{_fontdir}
 
 
 %changelog
+* Wed Dec 24 2008 Akira TAGOH <tagoh at redhat.com> - 20081012-6
+- Update the spec file to fit into new guideline. (#477395)
+
 * Fri Nov 14 2008 Akira TAGOH <tagoh at redhat.com> - 20081012-5
 - Fix a typo in fontconfig config again.