rpms/roadstencil-fonts/devel roadstencil-fonts.spec,1.5,1.6

[Jon Stanley]

Author: jstanley

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

Modified Files:
	roadstencil-fonts.spec 
Log Message:
update to new guidelines



Index: roadstencil-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roadstencil-fonts/devel/roadstencil-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- roadstencil-fonts.spec	25 Feb 2009 20:11:21 -0000	1.5
+++ roadstencil-fonts.spec	9 Mar 2009 05:06:18 -0000	1.6
@@ -1,64 +1,60 @@
-%define fontname        roadstencil
-%define fontdir         %{_datadir}/fonts/%{fontname}
-%define fontconfdir     %{_sysconfdir}/fonts/conf.d
+%define fontname roadstencil
+%define fontconf 63-%{fontname}.conf
 
 Name:           %{fontname}-fonts
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Roadstencil Fonts
 
 Group:          User Interface/X
 License:        OFL
 URL:            http://openfontlibrary.org/media/files/andyfitz/237
 Source0:        http://openfontlibrary.org/people/andyfitz/andyfitz_-_roadstencil.otf
-Source1:	%{fontname}-fontconfig.conf
+Source1:        %{fontname}-fontconfig.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+Requires:       fontpackages-filesystem
 
 %description
 A rough font influenced by roadwork stencils
 
 %prep
-cp -p %{SOURCE0} $RPM_BUILD_DIR/roadstencil.otf
 
 %build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-install -dm 755 $RPM_BUILD_ROOT%{fontdir}
-install -pm 644 *.otf $RPM_BUILD_ROOT%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/roadstencil.otf
 
-install -dm 755 $RPM_BUILD_ROOT%{fontconfdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/63-%{fontname}.conf
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 
-%post
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
+%clean
+rm -fr %{buildroot}
 
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
 
+%_font_pkg -f %{fontconf} *.otf
 
-%files
-%defattr(644,root,root,755)
 %doc
-%dir %{fontdir}/
-%{fontdir}/*.otf
-%config(noreplace) %{fontconfdir}/63-%{fontname}.conf
+
+%dir %{_fontdir}
 
 
 %changelog
+* Sun Mar 8 2009 Jon Stanley <jonstanley at gmail.com> - 1.0-7
+- Update for new guidelines
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -76,3 +72,4 @@
 
 * Sun May 04 2008 Jon Stanley <jonstanley at gmail.com> - 1.0-1
 - Initial package
+