--- cm-super-fonts.spec	2002-11-27 22:17:15 +0300
+++ cm-super-fonts.spec.my	2005-10-30 15:07:26 +0300
@@ -2,7 +2,7 @@
 
 Name: cm-super-fonts
 Version: 0.3.3
-Release: alt6
+Release: alt7
 Summary: Cyrillic Type 1 EC/TC and LH fonts
 Group: Publishing
 License: GPL
@@ -122,8 +122,12 @@
 
 %install
 # Directories for cm-super fonts
+%define mapdir %_datadir/texmf/fonts/map/dvips/cm-super
+%define encdir %_datadir/texmf/fonts/enc/dvips/cm-super
+
 %__mkdir -p %buildroot/%_datadir/texmf/fonts/{type1,afm}/public
-%__mkdir -p %buildroot/%_datadir/texmf/dvips/{config,base}
+%__mkdir -p %buildroot%mapdir
+%__mkdir -p %buildroot%encdir
 %__mkdir -p %buildroot/%type1fontsdir/afms
 %__mkdir -p %buildroot/%_sysconfdir/tex-fonts.d
 
@@ -137,14 +141,14 @@
 	%__ln_s afms/$i %buildroot%type1fontsdir/$i
     done	
 popd    
-%__ln_s %type1fontsdir %buildroot/%_datadir/texmf/fonts/type1/public/cm-super
-%__ln_s %type1fontsdir/afms %buildroot/%_datadir/texmf/fonts/afm/public/cm-super
+%__ln_s ../../../../fonts/default/Type1-cm-super %buildroot/%_datadir/texmf/fonts/type1/public/cm-super
+%__ln_s ../../../../fonts/default/Type1-cm-super/afms %buildroot/%_datadir/texmf/fonts/afm/public/cm-super
 pushd dvips
     for i in *.map ; do
 	echo "Map $i" >> %buildroot/%_sysconfdir/tex-fonts.d/cm-super.cfg
-	%__cp $i %buildroot%_datadir/texmf/dvips/config/
+	%__cp $i %buildroot%mapdir/
     done
-    %__cp *.enc %buildroot%_datadir/texmf/dvips/base/
+    %__cp *.enc %buildroot%encdir/
 popd
 
 %post
@@ -187,10 +191,10 @@
 %_datadir/texmf/fonts/afm/public/cm-super
 
 %files tex-dvips
-%_datadir/texmf/dvips/base/*
+%mapdir/*
 
 %files tex
-%_datadir/texmf/dvips/config/*
+%encdir/*
 %_datadir/texmf/fonts/type1/public/cm-super
 %_sysconfdir/tex-fonts.d/cm-super.cfg