Thu Jan 21 22:07:19 UTC 2010

Author: spot

Update of /cvs/pkgs/rpms/artwiz-aleczapka-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9516

Modified Files:
	artwiz-aleczapka-fonts.spec 
Added Files:
	artwiz-aleczapka-fonts-1.3-fix-makepcf.patch 
	artwiz-aleczapka-fonts-anorexia-fontconfig.conf 
	artwiz-aleczapka-fonts-aqui-fontconfig.conf 
	artwiz-aleczapka-fonts-cure-fontconfig.conf 
	artwiz-aleczapka-fonts-drift-fontconfig.conf 
	artwiz-aleczapka-fonts-edges-fontconfig.conf 
	artwiz-aleczapka-fonts-fkp-fontconfig.conf 
	artwiz-aleczapka-fonts-gelly-fontconfig.conf 
	artwiz-aleczapka-fonts-glisp-fontconfig.conf 
	artwiz-aleczapka-fonts-kates-fontconfig.conf 
	artwiz-aleczapka-fonts-lime-fontconfig.conf 
	artwiz-aleczapka-fonts-mints-mild-fontconfig.conf 
	artwiz-aleczapka-fonts-mints-strong-fontconfig.conf 
	artwiz-aleczapka-fonts-nu-fontconfig.conf 
	artwiz-aleczapka-fonts-smoothansi-fontconfig.conf 
	artwiz-aleczapka-fonts-snap-fontconfig.conf 
Log Message:
rework package to match font package guidelines

artwiz-aleczapka-fonts-1.3-fix-makepcf.patch:
 artwiz-aleczapka-de-sources-1.3/makepcf.sh |    2 +-
 artwiz-aleczapka-en-sources-1.3/makepcf.sh |    2 +-
 artwiz-aleczapka-se-sources-1.3/makepcf.sh |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE artwiz-aleczapka-fonts-1.3-fix-makepcf.patch ---
diff -up artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-de-sources-1.3/makepcf.sh.BAD artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-de-sources-1.3/makepcf.sh
--- artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-de-sources-1.3/makepcf.sh.BAD	2010-01-21 15:58:19.237307604 -0500
+++ artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-de-sources-1.3/makepcf.sh	2010-01-21 15:58:29.738317722 -0500
@@ -6,7 +6,7 @@
 LIST=`ls -la *.bdf | awk '{print $9}'`
 for font in $LIST
 do
-	pcf=`echo $font | cut -d'.' -f1`
+	pcf=`basename $font .bdf`
 	pcf="$pcf.pcf"
 	bdftopcf -o $pcf $font
 done;
diff -up artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-en-sources-1.3/makepcf.sh.BAD artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-en-sources-1.3/makepcf.sh
--- artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-en-sources-1.3/makepcf.sh.BAD	2010-01-21 15:58:52.018332523 -0500
+++ artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-en-sources-1.3/makepcf.sh	2010-01-21 15:58:55.857314725 -0500
@@ -6,7 +6,7 @@
 LIST=`ls -la *.bdf | awk '{print $9}'`
 for font in $LIST
 do
-	pcf=`echo $font | cut -d'.' -f1`
+	pcf=`basename $font .bdf`
 	pcf="$pcf.pcf"
 	bdftopcf -o $pcf $font
 done;
diff -up artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-se-sources-1.3/makepcf.sh.BAD artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-se-sources-1.3/makepcf.sh
--- artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-se-sources-1.3/makepcf.sh.BAD	2010-01-21 15:59:07.485332588 -0500
+++ artwiz-aleczapka-fonts-1.3/artwiz-aleczapka-se-sources-1.3/makepcf.sh	2010-01-21 15:59:15.277308049 -0500
@@ -6,7 +6,7 @@
 LIST=`ls -la *.bdf | awk '{print $9}'`
 for font in $LIST
 do
-	pcf=`echo $font | cut -d'.' -f1`
+	pcf=`basename $font .bdf`
 	pcf="$pcf.pcf"
 	bdftopcf -o $pcf $font
 done;


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


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


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


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


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


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


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


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


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


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


--- NEW FILE artwiz-aleczapka-fonts-mints-mild-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Mints Mild</family>
    </prefer>
  </alias>
  <alias>
    <family>Mints Mild</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE artwiz-aleczapka-fonts-mints-strong-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Mints Strong</family>
    </prefer>
  </alias>
  <alias>
    <family>Mints Strong</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


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


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


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


Index: artwiz-aleczapka-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/artwiz-aleczapka-fonts/devel/artwiz-aleczapka-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- artwiz-aleczapka-fonts.spec	14 Jan 2010 23:11:31 -0000	1.8
+++ artwiz-aleczapka-fonts.spec	21 Jan 2010 22:07:19 -0000	1.9
@@ -1,31 +1,255 @@
-%define         fontdir %{_datadir}/fonts/artwiz-aleczapka
+%global fontname artwiz-aleczapka
+%global fontconf 60-%{fontname}
 
-Name:           artwiz-aleczapka-fonts
-Version:        1.3
-Release:        9%{?dist}
-Summary:        Set of (improved) artwiz fonts
-
-Group:          User Interface/X
-License:        GPLv2
-URL:            http://artwizaleczapka.sourceforge.net/
-Source0:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-en-sources-1.3.tar.bz2
-Source1:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-de-sources-1.3.tar.bz2
-Source2:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-se-sources-1.3.tar.bz2
+%define common_desc \
+Artwiz is a family of very small futuristic fonts, with varying styles of \
+typefaces designed at a single pixel size. The minimal nature of the \
+fonts makes them popular with users of lightweight window managers. These \
+fonts have been updated by Alec Zapka to be compatible with modern \
+software and support an extended character set. \
+
+Name:		%{fontname}-fonts
+Version:	1.3
+Release:	10%{?dist}
+Summary:	Very small futuristic font family
+Group:		User Interface/X
+License:	GPLv2
+URL:		http://artwizaleczapka.sourceforge.net/
+Source0:	http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-en-sources-1.3.tar.bz2
+Source1:	http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-de-sources-1.3.tar.bz2
+Source2:	http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-se-sources-1.3.tar.bz2
+Source3:	artwiz-aleczapka-fonts-anorexia-fontconfig.conf
+Source4:	artwiz-aleczapka-fonts-aqui-fontconfig.conf
+Source5:	artwiz-aleczapka-fonts-cure-fontconfig.conf
+Source6:	artwiz-aleczapka-fonts-drift-fontconfig.conf
+Source7:	artwiz-aleczapka-fonts-edges-fontconfig.conf
+Source8:	artwiz-aleczapka-fonts-fkp-fontconfig.conf
+Source9:	artwiz-aleczapka-fonts-gelly-fontconfig.conf
+Source10:	artwiz-aleczapka-fonts-glisp-fontconfig.conf
+Source11:	artwiz-aleczapka-fonts-kates-fontconfig.conf
+Source12:	artwiz-aleczapka-fonts-lime-fontconfig.conf
+Source13:	artwiz-aleczapka-fonts-mints-mild-fontconfig.conf
+Source14:	artwiz-aleczapka-fonts-mints-strong-fontconfig.conf
+Source15:	artwiz-aleczapka-fonts-nu-fontconfig.conf
+Source16:	artwiz-aleczapka-fonts-smoothansi-fontconfig.conf
+Source17:	artwiz-aleczapka-fonts-snap-fontconfig.conf
 Patch0:		artwiz-aleczapka-fkp-cleanups.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-BuildRequires:  xorg-x11-font-utils
+Patch1:		artwiz-aleczapka-fonts-1.3-fix-makepcf.patch
+BuildArch:	noarch
+BuildRequires:	xorg-x11-font-utils, fontpackages-devel
+Requires:	%{fontname}-anorexia-fonts = %{version}-%{release}
+Requires:	%{fontname}-aqui-fonts = %{version}-%{release}
+Requires:	%{fontname}-cure-fonts = %{version}-%{release}
+Requires:	%{fontname}-drift-fonts = %{version}-%{release}
+Requires:	%{fontname}-edges-fonts = %{version}-%{release}
+Requires:	%{fontname}-fkp-fonts = %{version}-%{release}
+Requires:	%{fontname}-gelly-fonts = %{version}-%{release}
+Requires:	%{fontname}-glisp-fonts	= %{version}-%{release}
+Requires:	%{fontname}-kates-fonts = %{version}-%{release}
+Requires:	%{fontname}-lime-fonts = %{version}-%{release}
+Requires:	%{fontname}-mints-mild-fonts = %{version}-%{release}
+Requires:	%{fontname}-mints-strong-fonts = %{version}-%{release}
+Requires:	%{fontname}-nu-fonts = %{version}-%{release}
+Requires:	%{fontname}-smoothansi-fonts = %{version}-%{release}
+Requires:	%{fontname}-snap-fonts = %{version}-%{release}
 
 %description
-This is set of (improved) artwiz fonts.
-The ultimate solution to your all problems with artwiz fonts.
-Screenshots: http://artwizaleczapka.sourceforge.net/images/shots/
+%common_desc
+This is a metapackage, which pulls in all the separated fonts in this family.
+
+%package common
+Summary:	Common files for Artwiz Aleczapka fonts (documentation...)
+Group:		User Interface/X
+Requires:	fontpackages-filesystem
+
+%description common
+%common_desc
+
+%package -n %{fontname}-anorexia-fonts
+Summary:	Anorexia font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-anorexia-fonts
+%common_desc
+This package contains the Anorexia font in three encodings, English, German, 
+and Swedish.
+
+%_font_pkg -n anorexia -f %{fontconf}-anorexia.conf anorexia*.pcf
+
+%package -n %{fontname}-aqui-fonts
+Summary:	Aqui font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-aqui-fonts
+%common_desc
+This package contains the Aqui font in three encodings, English, German, and
+Swedish.
+
+%_font_pkg -n aqui -f %{fontconf}-aqui.conf aqui*.pcf
+
+%package -n %{fontname}-cure-fonts
+Summary:	Cure font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n	%{fontname}-cure-fonts
+%common_desc
+This package contains the Cure font in three encodings, English, German, and 
+Swedish.
+
+%_font_pkg -n cure -f %{fontconf}-cure.conf cure*.pcf
+
+%package -n %{fontname}-drift-fonts
+Summary:	Drift font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-drift-fonts
+%common_desc
+This package contains the Drift font in three encodings, English, German,
+and Swedish.
+
+%_font_pkg -n drift -f %{fontconf}-drift.conf drift*.pcf
+
+%package -n %{fontname}-edges-fonts
+Summary:	Edges font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-edges-fonts
+%common_desc
+This package contains the Edges font in three encodings, English, German,
+and Swedish.
+
+%_font_pkg -n edges -f %{fontconf}-edges.conf edges*.pcf
+
+%package -n %{fontname}-fkp-fonts
+Summary:	Fkp font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-fkp-fonts
+%common_desc
+This package contains the fkp font in three encodings, English, German,
+and Swedish.
+
+%_font_pkg -n fkp -f %{fontconf}-fkp.conf fkp*.pcf
+
+%package -n %{fontname}-gelly-fonts
+Summary:	Gelly font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-gelly-fonts
+%common_desc
+This package contains the Gelly font in three encodings, English, German,
+and Swedish.
+
+%_font_pkg -n gelly -f %{fontconf}-gelly.conf gelly*.pcf
+
+%package -n %{fontname}-glisp-fonts
+Summary:	Glisp fonts in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-glisp-fonts
+%common_desc
+This package contains the Glisp font in three encodings, English, German,
+and Swedish. It also includes a Regular and Bold version of the font for 
+each encoding.
+
+%_font_pkg -n glisp -f %{fontconf}-glisp.conf glisp*.pcf
+
+%package -n %{fontname}-kates-fonts
+Summary:	Kates font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-kates-fonts
+%common_desc
+This package contains the Kates font in three encodings, English, German,
+and Swedish. 
+
+%_font_pkg -n kates -f %{fontconf}-kates.conf kates*.pcf
+
+%package -n %{fontname}-lime-fonts
+Summary:	Lime font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-lime-fonts
+%common_desc
+This package contains the Lime font in three encodings, English, German,
+and Swedish.
+
+%_font_pkg -n lime -f %{fontconf}-lime.conf lime*.pcf
+
+%package -n %{fontname}-mints-mild-fonts
+Summary:	Mints Mild font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-mints-mild-fonts
+%common_desc
+This package contains the Mints Mild font in three encodings, English, German,
+and Swedish.
+
+%_font_pkg -n mints-mild -f %{fontconf}-mints-mild.conf mints-mild*.pcf
+
+%package -n %{fontname}-mints-strong-fonts
+Summary:	Mints Strong font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-mints-strong-fonts
+%common_desc
+This package contains the Mints Strong font in three encodings, English, 
+German, and Swedish.
+
+%_font_pkg -n mints-strong -f %{fontconf}-mints-strong.conf mints-strong*.pcf
+
+%package -n %{fontname}-nu-fonts
+Summary:	Nu font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-nu-fonts
+%common_desc
+This package contains the Nu font in three encodings, English, German,
+and Swedish.
+
+%_font_pkg -n nu -f %{fontconf}-nu.conf nu*.pcf
+
+%package -n %{fontname}-smoothansi-fonts
+Summary:	Smoothansi font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-smoothansi-fonts
+%common_desc
+This package contains the Smoothansi font in three encodings, English, 
+German, and Swedish.
+
+%_font_pkg -n smoothansi -f %{fontconf}-smoothansi.conf smoothansi*.pcf
+
+%package -n %{fontname}-snap-fonts
+Summary:	Snap font in Artwiz family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-snap-fonts
+%common_desc
+This package contains the Snap font in three encodings, English, German,
+and Swedish.
 
+%_font_pkg -n snap -f %{fontconf}-snap.conf snap*.pcf
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2
 %patch0 -p0
+%patch1 -p1 -b .fix-makepcf
 
 %build
 for lang in de en se; do
@@ -36,59 +260,55 @@ done
 
 
 %install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
+install -m 0755 -d %{buildroot}%{_fontdir}
 for lang in de en se; do
-    %{__install} -d -m 0755 %{buildroot}%{fontdir}/artwiz-aleczapka-$lang-%{version}
-    %{__install} -p -m 0644 %{_builddir}/%{name}-%{version}/artwiz-aleczapka-$lang-sources-%{version}/*.pcf \
-	%{buildroot}%{fontdir}/artwiz-aleczapka-$lang-%{version}
+    install -p -m 0644 artwiz-aleczapka-$lang-sources-%{version}/*.pcf %{buildroot}%{_fontdir}
+done
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
+install -m 0644 -p %{SOURCE3} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-anorexia.conf
+install -m 0644 -p %{SOURCE4} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-aqui.conf
+install -m 0644 -p %{SOURCE5} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-cure.conf
+install -m 0644 -p %{SOURCE6} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-drift.conf
+install -m 0644 -p %{SOURCE7} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-edges.conf
+install -m 0644 -p %{SOURCE8} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-fkp.conf
+install -m 0644 -p %{SOURCE9} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-gelly.conf
+install -m 0644 -p %{SOURCE10} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-glisp.conf
+install -m 0644 -p %{SOURCE11} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-kates.conf
+install -m 0644 -p %{SOURCE12} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-lime.conf
+install -m 0644 -p %{SOURCE13} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-mints-mild.conf
+install -m 0644 -p %{SOURCE14} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-mints-strong.conf
+install -m 0644 -p %{SOURCE15} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-nu.conf
+install -m 0644 -p %{SOURCE16} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-smoothansi.conf
+install -m 0644 -p %{SOURCE17} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-snap.conf
+
+for fontconf in %{fontconf}-anorexia.conf %{fontconf}-aqui.conf %{fontconf}-cure.conf %{fontconf}-drift.conf %{fontconf}-edges.conf %{fontconf}-fkp.conf %{fontconf}-gelly.conf\
+		%{fontconf}-glisp.conf %{fontconf}-kates.conf %{fontconf}-lime.conf %{fontconf}-mints-mild.conf %{fontconf}-mints-strong.conf %{fontconf}-nu.conf \
+		%{fontconf}-smoothansi.conf %{fontconf}-snap.conf
+do
+	ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
-
-# "touch" all files we've got flagged as %ghost but which are not
-# present in the %{buildroot} when RPM looks for files
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-{1,2}
-/bin/touch %{buildroot}%{fontdir}/artwiz-aleczapka-{de,en,se}-%{version}/fonts.cache-{1,2}
-
 
 %clean
-%{__rm} -rf %{buildroot}
-
-
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{_datadir}/fonts
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache %{_datadir}/fonts
-  fi
-fi
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-# generic docs are the same for every lang (AUHTORS has all info in german dir
+# This is a dummy metapackage.
+
+%files common
+%defattr(-,root,root,-)
+# generic docs are the same for every lang (AUTHORS has all info in german dir
 # so use it from german font dir)
 %doc artwiz-aleczapka-de-sources-1.3/{AUTHORS,COPYING,README,VERSION}
 %doc artwiz-aleczapka-de-sources-1.3/README.DE
 %doc artwiz-aleczapka-se-sources-1.3/README.SE
-%dir %{fontdir}
-%dir %{fontdir}/artwiz-aleczapka-de-%{version}
-%dir %{fontdir}/artwiz-aleczapka-en-%{version}
-%dir %{fontdir}/artwiz-aleczapka-se-%{version}
-%{fontdir}/*/*.pcf
-%ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
-%ghost %{fontdir}/artwiz-aleczapka-de-%{version}/fonts.cache-1
-%ghost %{fontdir}/artwiz-aleczapka-de-%{version}/fonts.cache-2
-%ghost %{fontdir}/artwiz-aleczapka-en-%{version}/fonts.cache-1
-%ghost %{fontdir}/artwiz-aleczapka-en-%{version}/fonts.cache-2
-%ghost %{fontdir}/artwiz-aleczapka-se-%{version}/fonts.cache-1
-%ghost %{fontdir}/artwiz-aleczapka-se-%{version}/fonts.cache-2
-
+%dir %{_fontdir}
 
 %changelog
+* Thu Jan 21 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-10
+- rework package to meet font packaging guidelines
+
 * Thu Jan 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-9
 - rebuild
 

