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

[Allan McRae]

    Date: Sunday, April 18, 2010 @ 00:12:20
  Author: allan
Revision: 77800

upgpkg: ed 1.4-2
make sure sh is available for install script, compress info pages

Modified:
  ed/trunk/PKGBUILD
  ed/trunk/ed.install

------------+
 PKGBUILD   |   10 ++++++----
 ed.install |    5 ++---
 2 files changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-18 04:07:47 UTC (rev 77799)
+++ PKGBUILD	2010-04-18 04:12:20 UTC (rev 77800)
@@ -3,14 +3,14 @@
 
 pkgname=ed
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A POSIX-compliant line editor"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/ed/ed.html"
 install=ed.install
 groups=('base-devel')
-depends=('glibc')
+depends=('glibc' 'sh')
 options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
 md5sums=('da0ddc0e0b0bec2da4b13b0d0d1bce2b')
@@ -19,10 +19,12 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/ --mandir=/usr/share/man --infodir=/usr/share/info
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
 
   cd ${pkgdir}/usr/share/info
   ln ed.info red.info
-
-  rm ${pkgdir}/usr/share/info/dir
 }

Modified: ed.install
===================================================================
--- ed.install	2010-04-18 04:07:47 UTC (rev 77799)
+++ ed.install	2010-04-18 04:12:20 UTC (rev 77800)
@@ -3,9 +3,8 @@
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
-
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -16,7 +15,7 @@
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }