[arch-commits] Commit in culmus/trunk (PKGBUILD culmus.install)

[François Charette]

    Date: Monday, January 19, 2009 @ 06:32:20
  Author: francois
Revision: 24666

upgpkg: culmus 0.102-1

Modified:
  culmus/trunk/PKGBUILD
  culmus/trunk/culmus.install

----------------+
 PKGBUILD       |   28 ++++++++++++++++------------
 culmus.install |   18 ++++++++----------
 2 files changed, 24 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-19 10:08:32 UTC (rev 24665)
+++ PKGBUILD	2009-01-19 11:32:20 UTC (rev 24666)
@@ -1,26 +1,30 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: <francois.archlinux.org>
 
 pkgname=culmus
-pkgver=0.101
-pkgrel=7
-pkgdesc="Culmus collection of Hebrew Type1 fonts for X Windows"
+pkgver=0.102
+pkgrel=1
+pkgdesc="Culmus collection of Hebrew fonts"
 arch=('i686' 'x86_64')
 url="http://culmus.sf.net"
 license=('GPL2')
 depends=('fontconfig' 'xorg-fonts-alias' 'xorg-font-utils' 'xorg-fonts-encodings')
 install=('culmus.install')
 source=("http://downloads.sourceforge.net/sourceforge/culmus/culmus-$pkgver.tar.gz")
-md5sums=('4dff942d859b9cac569d791c664e66a5')
+md5sums=('720d0dcce6e6a60db64de04e5afdb424')
 
 build() {
 # install fonts
-mkdir -p ${startdir}/pkg/usr/share/fonts/Type1
-install -m644 ${startdir}/src/culmus-$pkgver/{*.afm,*.pfa} \
-              ${startdir}/pkg/usr/share/fonts/Type1
+mkdir -p ${pkgdir}/usr/share/fonts/Type1
+install -m644 ${srcdir}/culmus-$pkgver/*.{afm,pfa} \
+              ${pkgdir}/usr/share/fonts/Type1
 
-# install provided conifg file with priority 61
-mkdir -p ${startdir}/pkg/etc/fonts/conf.avail/
-install -m644 ${startdir}/src/culmus-$pkgver/culmus.conf \
-              ${startdir}/pkg/etc/fonts/conf.avail/61-culmus.conf
+mkdir -p ${pkgdir}/usr/share/fonts/TTF
+install -m644 ${srcdir}/culmus-$pkgver/*.ttf \
+              ${pkgdir}/usr/share/fonts/TTF
+
+# install provided config file with priority 61
+mkdir -p ${pkgdir}/etc/fonts/conf.avail/
+install -m644 ${srcdir}/culmus-$pkgver/culmus.conf \
+              ${pkgdir}/etc/fonts/conf.avail/61-culmus.conf
 }

Modified: culmus.install
===================================================================
--- culmus.install	2009-01-19 10:08:32 UTC (rev 24665)
+++ culmus.install	2009-01-19 11:32:20 UTC (rev 24666)
@@ -1,11 +1,11 @@
 configs=('61-culmus.conf')
 
-update_fontcache_type1() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
+update_fontcache() {
+  fc-cache -fs
   mkfontscale /usr/share/fonts/Type1
   mkfontdir /usr/share/fonts/Type1
-  echo "done."
+  mkfontscale /usr/share/fonts/TTF
+  mkfontdir /usr/share/fonts/TTF
 }
 
 post_install() {
@@ -15,11 +15,11 @@
   done
   popd > /dev/null
 
-  update_fontcache_type1
+  update_fontcache
 }
 
 post_upgrade() {
-  if [ "`vercmp 0.101-6 $2`" != "-1" ] || [ ! -L /etc/fonts/conf.d/61-culmus.conf ]; then
+  if [ "`vercmp 0.102-1 $2`" != "-1" ] || [ ! -L /etc/fonts/conf.d/61-culmus.conf ]; then
     pushd /etc/fonts/conf.d > /dev/null
     for config in "${configs[@]}"; do
       ln -sf ../conf.avail/${config} .
@@ -27,8 +27,7 @@
     popd > /dev/null
   fi
 
-  update_fontcache_type1
-
+  update_fontcache
 }
 
 post_remove() {
@@ -38,8 +37,7 @@
   done
   popd > /dev/null
 
-  update_fontcache_type1
-
+  update_fontcache
 }
 
 op=$1