rpms/tiresias-fonts/devel tiresias-fonts-info-fontconfig.conf, NONE, 1.1 tiresias-fonts-info-z-fontconfig.conf, NONE, 1.1 tiresias-fonts-key-v2-fontconfig.conf, NONE, 1.1 tiresias-fonts-lp-fontconfig.conf, NONE, 1.1 tiresias-fonts-pc-fontconfig.conf, NONE, 1.1 tiresias-fonts-pc-z-fontconfig.conf, NONE, 1.1 tiresias-fonts-sign-fontconfig.conf, NONE, 1.1 tiresias-fonts-sign-z-fontconfig.conf, NONE, 1.1 tiresias-fonts.spec, 1.1, 1.2

Thu Jan 15 20:37:15 UTC 2009

Author: spot

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

Modified Files:
	tiresias-fonts.spec 
Added Files:
	tiresias-fonts-info-fontconfig.conf 
	tiresias-fonts-info-z-fontconfig.conf 
	tiresias-fonts-key-v2-fontconfig.conf 
	tiresias-fonts-lp-fontconfig.conf 
	tiresias-fonts-pc-fontconfig.conf 
	tiresias-fonts-pc-z-fontconfig.conf 
	tiresias-fonts-sign-fontconfig.conf 
	tiresias-fonts-sign-z-fontconfig.conf 
Log Message:
convert package to new guidelines

--- NEW FILE tiresias-fonts-info-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Infofont</family>
    </prefer>
  </alias>
  <alias>
    <family>Infofont</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Infofont Z</family>
    <accept>
      <family>Infofont</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-info-z-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Infofont Z</family>
    </prefer>
  </alias>
  <alias>
    <family>Infofont Z</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Infofont</family>
    <accept>
      <family>Infofont Z</family>
    </accept>
  </alias>
</fontconfig>


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


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


--- NEW FILE tiresias-fonts-pc-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>PCfont</family>
    </prefer>
  </alias>
  <alias>
    <family>PCfont</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>PCfont Z</family>
    <accept>
      <family>PCfont</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-pc-z-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>PCfont Z</family>
    </prefer>
  </alias>
  <alias>
    <family>PCfont Z</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>PCfont</family>
    <accept>
      <family>PCfont Z</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-sign-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Signfont</family>
    </prefer>
  </alias>
  <alias>
    <family>Signfont</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Signfont Z</family>
    <accept>
      <family>Signfont</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-sign-z-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Signfont Z</family>
    </prefer>
  </alias>
  <alias>
    <family>Signfont Z</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Signfont</family>
    <accept>
      <family>Signfont Z</family>
    </accept>
  </alias>
</fontconfig>


Index: tiresias-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tiresias-fonts/devel/tiresias-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tiresias-fonts.spec	7 Jan 2008 22:39:39 -0000	1.1
+++ tiresias-fonts.spec	15 Jan 2009 20:36:45 -0000	1.2
@@ -1,11 +1,17 @@
 %define fontname tiresias
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontconf 60-%{fontname}.conf
+
+%define common_desc \
+The Tiresias family of fonts has been designed for use in multiple environments \
+to help improve legibility, especially for individuals with visual impairment. \
+It includes specialized fonts for information labels, control labels (for key \
+tops), large print publications, computer systems, television subtitling, and \
+signs.
 
 Name:		%{fontname}-fonts
 Summary: 	Low vision fonts
 Version:	1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv3+
 Group:		User Interface/X
 Source0:	http://www.tiresias.org/fonts/infofont.zip
@@ -13,16 +19,148 @@
 Source2:	http://www.tiresias.org/fonts/lpfont.zip
 Source3:	http://www.tiresias.org/fonts/pcfont.zip
 Source4:	http://www.tiresias.org/fonts/signfont.zip
+Source5:	%{name}-info-fontconfig.conf
+Source6:	%{name}-info-z-fontconfig.conf
+Source7:	%{name}-key-v2-fontconfig.conf
+Source8:	%{name}-lp-fontconfig.conf
+Source9:	%{name}-pc-fontconfig.conf
+Source10:	%{name}-pc-z-fontconfig.conf
+Source11:	%{name}-sign-fontconfig.conf
+Source12:	%{name}-sign-z-fontconfig.conf
 URL:		http://www.tiresias.org/fonts/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	fontpackages-devel
 BuildArch:	noarch
 
 %description
-The Tiresias family of fonts has been designed for use in multiple environments 
-to help improve legibility, especially for individuals with visual impairment.
-It includes specialized fonts for information labels, control labels (for key
-tops), large print publications, computer systems, television subtitling, and 
-signs.
+%common_desc
+
+%package common
+Summary:	Common files for Tiresias fonts (documentation...)
+Group:		User Interface/X
+Requires:	fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other Tiresias packages.
+
+%package -n %{fontname}-info-fonts
+Summary:	Specialized fonts for info terminals for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-info-fonts
+%common_desc
+
+The Infofont family is specialized for use in informational labels on public 
+terminals such as ATMs using large characters. The only	difference between the
+Infofont and the Infofont Z families is whether the zero is crossed out or not.
+In the Infofont family, the zero is _not_ crossed out, which may lead to some
+confusion.
+
+%_font_pkg -n info -f %{fontconf}-infofont.conf "Tiresias*Infofont*.ttf"
+
+%package -n %{fontname}-info-z-fonts
+Summary:	Specialized fonts for info terminals for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-info-z-fonts
+%common_desc
+
+The Infofont Z family is specialized for use in informational labels on public
+terminals such as ATMs using large characters. The only difference between the
+Infofont Z and the Infofont families is whether the zero is crossed out or not.
+In the Infofont	Z family, the zero is crossed out.
+
+%_font_pkg -n info-z -f %{fontconf}-infofont-z.conf "TIRESIAS*INFOFONTZ*.ttf"
+
+%package -n %{fontname}-key-v2-fonts
+Summary:	Specialized fonts for labeling keycaps for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-key-v2-fonts
+%common_desc
+
+The Keyfont V2 family is specialized for use in labeling keycaps.
+
+%_font_pkg -n key-v2 -f %{fontconf}-keyfont-v2.conf "TIREKV__.ttf"
+
+%package -n %{fontname}-lp-fonts
+Summary:	Specialized font for large print publications
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-lp-fonts
+%common_desc
+
+The LPfont family is specialized for use in large print publications.
+
+%_font_pkg -n lp -f %{fontconf}-lpfont.conf "Tiresias*LPfont*.ttf"
+
+%package -n %{fontname}-pc-fonts
+Summary:	Specialized fonts for use on PCs for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n	%{fontname}-pc-fonts
+%common_desc
+
+The PCfont family is specialized for people with poor vision to use on PC 
+screens using large characters. The only difference between the PCfont and 
+the PCfont Z families is whether the zero is crossed out or not. In the 
+PCfont family, the zero is _not_ crossed out, which may lead to some
+confusion.
+
+%_font_pkg -n pc -f %{fontconf}-pcfont.conf "Tiresias*PCfont*.ttf"
+
+%package -n %{fontname}-pc-z-fonts
+Summary:	Specialized fonts for use on PCs for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-pc-z-fonts
+%common_desc
+
+The PCfont family is specialized for people with poor vision to use on PC
+screens using large characters.	The only difference between the PCfont and 
+the PCfont Z families is whether the zero is crossed out or not. In the
+PCfont Z family, the zero is crossed out.
+
+%_font_pkg -n pc-z -f %{fontconf}-pcfont-z.conf "TIRESIAS*PCFONTZ*.ttf"
+
+%package -n %{fontname}-sign-fonts
+Summary:	Specialized fonts for preparing signs for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-sign-fonts
+%common_desc
+
+The Signfont family is specialized for preparing signs for the visually 
+impaired, using large characters. The only difference between the Signfont and 
+the Signfont Z families is whether the zero is crossed out or not. In the
+Signfont family, the zero is _not_ crossed out, which may lead to some
+confusion.
+
+%_font_pkg -n sign -f %{fontconf}-signfont.conf "Tiresias*Signfont*.ttf"
+
+%package -n %{fontname}-sign-z-fonts
+Summary:	Specialized fonts for preparing signs for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n	%{fontname}-sign-z-fonts
+%common_desc
+
+The Signfont family is specialized for preparing signs for the visually 
+impaired, using	large characters. The only difference between the Signfont and 
+the Signfont Z families is whether the zero is crossed out or not. In the 
+Signfont Z family, the zero is crossed out.
+
+%_font_pkg -n sign-z -f %{fontconf}-signfont-z.conf "TIRESIAS*SIGNFONTZ*.ttf"
 
 %prep
 %setup -q -c -n %{name}
@@ -40,32 +178,36 @@
 %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 %{SOURCE5} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-infofont.conf
+install -m 0644 -p %{SOURCE6} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-infofont-z.conf
+install -m 0644 -p %{SOURCE7} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-keyfont-v2.conf
+install -m 0644 -p %{SOURCE8} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-lpfont.conf
+install -m 0644 -p %{SOURCE9} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pcfont.conf
+install -m 0644 -p %{SOURCE10} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pcfont-z.conf
+install -m 0644 -p %{SOURCE11} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-signfont.conf
+install -m 0644 -p %{SOURCE12} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-signfont-z.conf
+
+for fontconf in %{fontconf}-infofont.conf %{fontconf}-infofont-z.conf %{fontconf}-keyfont-v2.conf %{fontconf}-lpfont.conf\
+		%{fontconf}-pcfont.conf %{fontconf}-pcfont-z.conf %{fontconf}-signfont.conf %{fontconf}-signfont-z.conf; do
+	ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
-%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
+rm -rf %{buildroot}
 
-%files
+%files common
 %defattr(0644,root,root,0755)
 %doc COPYING/copying.doc COPYING/gpl.txt
-%dir %{fontdir}
-%{fontdir}/*.ttf 
+%dir %{_fontdir}
 
 %changelog
+* Thu Jan 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-3
+- rework to meet new font packaging guidelines
+
 * Wed Jan  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-2
 - font versions didn't change, but sha1sums did
 


