rpms/silkscreen-fonts/devel silkscreen-fonts-expanded-fontconfig.conf, NONE, 1.1 silkscreen-fonts-fontconfig.conf, NONE, 1.1 silkscreen-fonts.spec, 1.1, 1.2

[Tom Callaway]

Author: spot

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

Modified Files:
	silkscreen-fonts.spec 
Added Files:
	silkscreen-fonts-expanded-fontconfig.conf 
	silkscreen-fonts-fontconfig.conf 
Log Message:
compliance with new font packaging guidelines


--- NEW FILE silkscreen-fonts-expanded-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Silkscreen Expanded</family>
    </prefer>
  </alias>
  <alias>
    <family>Silkscreen Expanded</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE silkscreen-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Silkscreen</family>
    </prefer>
  </alias>
  <alias>
    <family>Silkscreen</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



Index: silkscreen-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/silkscreen-fonts/devel/silkscreen-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- silkscreen-fonts.spec	28 Jan 2008 17:37:42 -0000	1.1
+++ silkscreen-fonts.spec	15 Jan 2009 19:14:15 -0000	1.2
@@ -1,27 +1,56 @@
 %define fontname silkscreen
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontconf 60-%{fontname}
+
+%define common_desc \
+Silkscreen is a four member type family for your Web graphics created by Jason \
+Kottke. Silkscreen is best used in places where extremely small graphical \
+display type is needed. The primary use is for navigational items (nav bars, \
+menus, etc), but it works well wherever small type is needed. In order to \
+preserve the proper spacing and letterforms, Silkscreen should be used at 8pt. \
+multiples (8pt., 16pt., 24pt., etc.) with anti-aliasing turned off. \
 
 Name:		%{fontname}-fonts
 Summary: 	Silkscreen four member type family
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 # License attribution confirmed by author and Open Font Library
 # http://openfontlibrary.org/media/files/jkottke/218
 License:	OFL
 Group:		User Interface/X
 Source0:	http://www.kottke.org/plus/type/silkscreen/download/silkscreen.tar.gz
+Source1:	%{name}-fontconfig.conf
+Source2:	%{name}-expanded-fontconfig.conf
 URL:		http://www.kottke.org/plus/type/silkscreen/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
+BuildRequires:	fontpackages-devel
+Requires:	%{name}-common = %{version}-%{release}
 
 %description
-Silkscreen is a four member type family for your Web graphics created by Jason 
-Kottke. Silkscreen is best used in places where extremely small graphical 
-display type is needed. The primary use is for navigational items (nav bars, 
-menus, etc), but it works well wherever small type is needed. In order to 
-preserve the proper spacing and letterforms, Silkscreen should be used at 8pt. 
-multiples (8pt., 16pt., 24pt., etc.) with anti-aliasing turned off.
+%common_desc
+
+%package common
+Summary:	Common files for Silkscreen fonts (documentation...)
+Group:		User Interface/X
+Requires:	fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other Silkscreen packages.
+
+%package -n %{fontname}-expanded-fonts
+Summary:	Expanded Silkscreen font family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-expanded-fonts
+%common_desc
+
+This font family has a slightly expanded spacing between the letters in 
+comparison to the normal Silkscreen font family.
+
+%_font_pkg -n expanded -f %{fontconf}-expanded.conf slkscre*.ttf
 
 %prep
 %setup -q -c -n %{name}
@@ -29,31 +58,30 @@
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -m 0755 -d $RPM_BUILD_ROOT%{fontdir}
-install -m 0644 -p *.ttf $RPM_BUILD_ROOT%{fontdir}
+rm -rf %{buildroot}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
+install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-expanded.conf
+
+for fontconf in %{fontconf}.conf %{fontconf}-expanded.conf ; do
+	ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-		%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
+%_font_pkg -f %{fontconf}.conf slkscr.ttf slkscrb.ttf
 
-%files
+%files common
 %defattr(0644,root,root,0755)
 %doc readme.txt
-%dir %{fontdir}
-%{fontdir}/*.ttf 
+%dir %{_fontdir}
 
 %changelog
+* Thu Jan 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-2
+- rework package for new font guidelines
+
 * Tue Dec 11 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-1
 - Initial package for Fedora