--- rpm-build-fonts-0.1/macros.orig	2007-01-12 03:50:54 +0300
+++ rpm-build-fonts-0.1/macros	2007-09-03 17:33:31 +0400
@@ -3,6 +3,7 @@
 # 12.02.2006, 12.01.2007
 #
 
+%_fontpathdir %_sysconfdir/X11/fontpath.d
 %_fontsdir %_datadir/fonts
 %_bitmapfontsdir %_fontsdir/bitmap
 %_type1fontsdir %_fontsdir/type1
@@ -11,7 +12,7 @@
 
 %fonts_requires \
 BuildRequires: rpm-build-fonts \
-PreReq: chkfontpath fontconfig \
+PreReq: fontconfig >= 2.4.2 \
 %nil
 
 # for use in %%install section (use with name of font family)
@@ -22,13 +23,16 @@ PreReq: chkfontpath fontconfig \
 mkdir -p %buildroot%__currentfontsdir \
 cat <<EOF >%{1}.files \
 %%dir %__currentfontsdir \
-%%config %__currentfontsdir/fonts.cache-1 \
-%%config %__currentfontsdir/fonts.dir \
+%__currentfontsdir/fonts.scale \
+%__currentfontsdir/fonts.dir \
+%_fontpathdir/ttf-%{1}:pri=50 \
 EOF\
 install -p -m644 *.ttf %buildroot%__currentfontsdir/ \
 find %buildroot%__currentfontsdir/ -name "*.ttf" | sed -e "s|%buildroot||g" >>%{1}.files \
-%_sbindir/ttmkfdir -f %{1} -o %buildroot%__currentfontsdir/fonts.dir \
-touch %buildroot%__currentfontsdir/fonts.cache-1 \
+%_bindir/mkfontscale %buildroot%__currentfontsdir/ \
+ln -s fonts.scale %buildroot%__currentfontsdir/fonts.dir \
+mkdir -p %buildroot%_fontpathdir \
+ln -s ../../..%__currentfontsdir %buildroot%_fontpathdir/ttf-%{1}:pri=50 \
 %nil
 
 # TODO: split common parts
@@ -40,13 +44,16 @@ touch %buildroot%__currentfontsdir/fonts
 mkdir -p %buildroot%__currentfontsdir \
 cat <<EOF >%{1}.files \
 %%dir %__currentfontsdir \
-%%config %__currentfontsdir/fonts.cache-1 \
-%%config %__currentfontsdir/fonts.dir \
+%__currentfontsdir/fonts.scale \
+%__currentfontsdir/fonts.dir \
+%_fontpathdir/otf-%{1}:pri=50 \
 EOF\
 install -p -m644 *.otf %buildroot%__currentfontsdir/ \
 find %buildroot%__currentfontsdir/ -name "*.otf" | sed -e "s|%buildroot||g" >>%{1}.files \
-%_sbindir/ttmkfdir -f %{1} -o %buildroot%__currentfontsdir/fonts.dir \
-touch %buildroot%__currentfontsdir/fonts.cache-1 \
+%_bindir/mkfontscale %buildroot%__currentfontsdir \
+ln -s fonts.scale %buildroot%__currentfontsdir/fonts.dir \
+mkdir -p %buildroot%_fontpathdir \
+ln -s ../../..%__currentfontsdir %buildroot%_fontpathdir/otf-%{1}:pri=50 \
 %nil
 
 
@@ -56,13 +63,18 @@ touch %buildroot%__currentfontsdir/fonts
 mkdir -p %buildroot%__type1dir \
 cat <<EOF >%{1}.files \
 %%dir %__type1dir \
-%%config %__type1dir/fonts.cache-1 \
-%%config %__type1dir/fonts.dir \
+%__type1dir/fonts.scale \
+%__type1dir/fonts.dir \
+%_fontpathdir/type1-%{1}:pri=40 \
 EOF\
-install -p -m644 *.afm *.pfb %buildroot%__type1dir \
+find -name \*.afm -exec install -p -m644 -t %buildroot%__type1dir {} \; \
+find -name \*.pfb -exec install -p -m644 -t %buildroot%__type1dir {} \; \
+find -name \*.pfa -exec install -p -m644 -t %buildroot%__type1dir {} \; \
 find %buildroot%__type1dir/ -name "*.*" | sed -e "s|%buildroot||g" >>%{1}.files \
-mkfontdir %buildroot%__type1dir \
-touch %buildroot%__type1dir/fonts.cache-1 \
+mkfontscale %buildroot%__type1dir \
+ln -s fonts.scale %buildroot%__type1dir/fonts.dir \
+mkdir -p %buildroot%_fontpathdir \
+ln -s ../../..%__type1dir %buildroot%_fontpathdir/type1-%{1}:pri=40 \
 %nil
 
 %bitmap_fonts_install() \
@@ -71,25 +83,25 @@ touch %buildroot%__type1dir/fonts.cache-
 mkdir -p %buildroot%__currentfontsdir \
 cat <<EOF >%{1}.files \
 %%dir %__currentfontsdir \
-%%config %__currentfontsdir/fonts.cache-1 \
-%%config %__currentfontsdir/fonts.dir \
+%__currentfontsdir/fonts.dir \
+%_fontpathdir/bitmap-%{1}:pri=20 \
 EOF\
 install -p -m644 *.pcf.gz %buildroot%__currentfontsdir/ \
-find %buildroot%__currentfontsdir/ -name "*.otf" | sed -e "s|%buildroot||g" >>%{1}.files \
-%_sbindir/ttmkfdir -f %{1} -o %buildroot%__currentfontsdir/fonts.dir \
-touch %buildroot%__currentfontsdir/fonts.cache-1 \
+find %buildroot%__currentfontsdir/ -name "*.pcf.gz" | sed -e "s|%buildroot||g" >>%{1}.files \
+%_bindir/mkfontdir %buildroot%__currentfontsdir \
+mkdir -p %buildroot%_fontpathdir \
+ln -s ../../..%__currentfontsdir %buildroot%_fontpathdir/bitmap-%{1}:pri=20 \
 %nil
 
 # for use in %%post section
 %post_fonts \
 %_bindir/fc-cache %__currentfontsdir || : \
-%_sbindir/chkfontpath -q --add %__currentfontsdir || : \
 %nil
 
 # for use in %%postun section
 %postun_fonts \
 if [ "$1" = "0" ]; then \
-%_sbindir/chkfontpath -q --remove %__currentfontsdir || : \
+%_bindir/fc-cache --system-only || : \
 fi \
 %nil
 
--- rpm-build-fonts-0.1/rpm-build-fonts.spec.orig	2007-01-12 03:51:40 +0300
+++ rpm-build-fonts-0.1/rpm-build-fonts.spec	2007-09-03 17:23:50 +0400
@@ -13,7 +13,7 @@ BuildArch: noarch
 BuildRequires: rpm-build-compat
 
 # for ttf, type1 fonts indexing
-Requires: ttmkfdir xorg-x11-font-utils mkfontdir
+Requires: xorg-x11-font-utils
 
 %description
 RPM helper scripts for build fonts packages.