[arch-commits] Commit in font-misc-ethiopic/trunk (PKGBUILD xfonts.install)

[Allan McRae]

    Date: Tuesday, September 13, 2011 @ 01:55:36
  Author: allan
Revision: 137956

upgpkg: font-misc-ethiopic 1.0.1-1

rebuild of old package, only update system font cache

Modified:
  font-misc-ethiopic/trunk/PKGBUILD
  font-misc-ethiopic/trunk/xfonts.install

----------------+
 PKGBUILD       |   14 ++++++++------
 xfonts.install |    2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-13 05:19:48 UTC (rev 137955)
+++ PKGBUILD	2011-09-13 05:55:36 UTC (rev 137956)
@@ -17,13 +17,15 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
-      --with-mapfiles=/usr/share/fonts/util \
       --with-ttf-fontdir=/usr/share/fonts/TTF \
-      --with-otf-fontdir=/usr/share/fonts/OTF || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --with-otf-fontdir=/usr/share/fonts/OTF
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   rm -f "${pkgdir}/usr/share/fonts"/*/fonts.*
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }

Modified: xfonts.install
===================================================================
--- xfonts.install	2011-09-13 05:19:48 UTC (rev 137955)
+++ xfonts.install	2011-09-13 05:55:36 UTC (rev 137956)
@@ -1,6 +1,6 @@
 post_install() {
   echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
+  fc-cache -f -s > /dev/null
   mkfontscale /usr/share/fonts/TTF /usr/share/fonts/OTF
   mkfontdir /usr/share/fonts/TTF /usr/share/fonts/OTF
   echo "done."