From 80587f16a16eb1bed2bc377c0822aac08d69b49b Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sun, 7 Dec 2014 01:12:02 -0600 Subject: system/culmus: Fix font installation and doinst.sh paths Signed-off-by: Robby Workman --- system/culmus/culmus.SlackBuild | 5 ++++- system/culmus/doinst.sh | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/system/culmus/culmus.SlackBuild b/system/culmus/culmus.SlackBuild index bb0cbb0dea..21a0e03cf4 100644 --- a/system/culmus/culmus.SlackBuild +++ b/system/culmus/culmus.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=culmus VERSION=${VERSION:-0.130} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} ARCH=${ARCH:-noarch} @@ -60,6 +60,9 @@ cp *.pfa *.afm $PKG/usr/share/fonts/Type1/ mkdir -p $PKG/etc/fonts/conf.avail/ cp culmus.conf $PKG/etc/fonts/conf.avail/61-culmus.conf +mkdir -p $PKG/etc/fonts/conf.d +ln -sf ../conf.avail/61-culmus.conf $PKG/etc/fonts/conf.d + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ CHANGES GNU-GPL LICENSE LICENSE-BITSTREAM \ diff --git a/system/culmus/doinst.sh b/system/culmus/doinst.sh index 978cbdd491..3360147998 100644 --- a/system/culmus/doinst.sh +++ b/system/culmus/doinst.sh @@ -1,12 +1,17 @@ #!/bin/sh -fc-cache -f -cd /usr/share/fonts/TTF -/usr/bin/mkfontscale -/usr/bin/mkfontdir +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi -cd /usr/share/fonts/Type1 -/usr/bin/mkfontscale -/usr/bin/mkfontdir +# Update the X font indexes: +if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then + ( cd /usr/share/fonts/TTF + mkfontscale . + mkfontdir . + ) + ( cd /usr/share/fonts/Type1 + mkfontscale . + mkfontdir . + ) -( cd /etc/fonts/conf.d ; ln -sf ../conf.avail/61-culmus.conf 61-culmus.conf ) -- cgit v1.2.3-65-gdbad