- support fonts.scale.* merging for CID and Speedo

- cyrillic are raster fonts (treat like 75dpi and 100dpi)
- no action for PEX
- release 2

Changed files:
    fontpostinst -> 1.3
    fontpostinst.spec -> 1.3

diff --git a/fontpostinst b/fontpostinst
index a1cf8e05bbc7198f1d8bf8079cf31417f94ce5d0..a20fe4a38214119427160e99f43bc3b045bb9348 100644 (file)
--- a/fontpostinst
+++ b/fontpostinst
@@ -102,6 +102,18 @@ case "$FTYPE" in
                $GNOMEFONTINST
        fi
        ;;
+    CID|Speedo)
+       if "`echo fonts.scale.*`" != 'fonts.scale.*' ]; then
+               cat fonts.scale.* 2>/dev/null | LC_ALL=C sort -u > fonts.scale.tmp
+               cat fonts.scale.tmp | wc -l | tr -d ' ' > fonts.scale
+               cat fonts.scale.tmp >> fonts.scale
+               rm -f fonts.scale.tmp
+       elif [ -f fonts.scale ]; then
+               mv -f fonts.scale fonts.scale-save
+       fi
+       if [ -x $MKFONTDIRBIN ]; then
+               $MKFONTDIR
+       fi
     misc)
        # special case - fonts needed for X server to start
        if [ -x $MKFONTDIRBIN ]; then
@@ -114,11 +126,13 @@ cursor.pcf.gz cursor
 EOF
        fi
        ;;
-    100dpi|75dpi|CID|Speedo|PEX)
+    100dpi|75dpi|cyrillic)
        if [ -x $MKFONTDIRBIN ]; then
                $MKFONTDIR
        fi
        ;;
+    PEX)
+       ;;
     *)
        echo "Warning: \"$FTYPE\": unknown font type!" >&2
        if [ -x $MKFONTDIRBIN ]; then

diff --git a/fontpostinst.spec b/fontpostinst.spec
index aed159d6cffb3664d9a1368eaa29b66748f2b7a1..af5ccc277d497b41e65c5704e5a7b99819d17232 100644 (file)
--- a/fontpostinst.spec
+++ b/fontpostinst.spec
@@ -2,7 +2,7 @@ Summary:        Font post (un)installation script
 Summary(pl):   Skrypt po(de)instalacyjny dla fontów
 Name:          fontpostinst
 Version:       0.1
-Release:       1
+Release:       2
 License:       Free
 Group:         Applications/System
 Source0:       %{name}