[arch-commits] Commit in xorg-fonts-encodings/trunk (2 files)

[Jan de Groot]

    Date: Thursday, March 17, 2011 @ 10:45:49
  Author: jgc
Revision: 115261

upgpkg: xorg-fonts-encodings 1.0.4-1
Update to 1.0.4, remove install scriptlet

Modified:
  xorg-fonts-encodings/trunk/PKGBUILD
Deleted:
  xorg-fonts-encodings/trunk/xorg-fonts-encodings.install

------------------------------+
 PKGBUILD                     |   18 +++++++++---------
 xorg-fonts-encodings.install |   11 -----------
 2 files changed, 9 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-17 13:15:29 UTC (rev 115260)
+++ PKGBUILD	2011-03-17 14:45:49 UTC (rev 115261)
@@ -2,23 +2,23 @@
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-fonts-encodings
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="X.org font encoding files"
 arch=(any)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('xorg-font-utils')
-install=xorg-fonts-encodings.install
+makedepends=('xorg-mkfontscale' 'xorg-util-macros' 'xorg-font-util')
+groups=('xorg-fonts' 'xorg')
 source=(${url}/releases/individual/font/encodings-${pkgver}.tar.bz2)
-md5sums=('29637480e7ce12546668631067c19ced')
+sha1sums=('24ace2470403f85a0d393769204029bd8247992a')
 
 build() {
   cd "${srcdir}/encodings-${pkgver}"
-  ./configure --prefix=/usr \
-      --with-encodingsdir=/usr/share/fonts/encodings || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  autoreconf
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }

Deleted: xorg-fonts-encodings.install
===================================================================
--- xorg-fonts-encodings.install	2011-03-17 13:15:29 UTC (rev 115260)
+++ xorg-fonts-encodings.install	2011-03-17 14:45:49 UTC (rev 115261)
@@ -1,11 +0,0 @@
-post_install() {
-  echo -n "Regenerating font encodings... "
-  pushd usr/share/fonts/encodings &>/dev/null
-  mkfontscale -n -e "/usr/share/fonts/encodings" -e "/usr/share/fonts/encodings/large"
-  popd &>/dev/null
-  echo "done."
-}
-
-post_upgrade() {
-  post_install
-}