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

[Allan McRae]

    Date: Monday, April 19, 2010 @ 05:54:27
  Author: allan
Revision: 78099

upgpkg: texinfo 4.13a-4
rebuild for package more than a year old

Modified:
  texinfo/trunk/PKGBUILD
  texinfo/trunk/texinfo.install

-----------------+
 PKGBUILD        |   16 +++++++++-------
 texinfo.install |    6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-19 09:34:48 UTC (rev 78098)
+++ PKGBUILD	2010-04-19 09:54:27 UTC (rev 78099)
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=texinfo
 pkgver=4.13a
-pkgrel=3
+pkgrel=4
 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/texinfo/"
@@ -18,9 +18,11 @@
 
 build() {
    cd ${srcdir}/${pkgname}-4.13
-   ./configure --prefix=/usr || return 1
-   make || return 1
-   make DESTDIR=${pkgdir} install || return 1
-   rm -f ${pkgdir}/usr/share/info/dir
-   gzip ${pkgdir}/usr/share/info/*
+   ./configure --prefix=/usr
+   make
 }
+
+package() {
+   cd ${srcdir}/${pkgname}-4.13
+   make DESTDIR=${pkgdir} install
+}

Modified: texinfo.install
===================================================================
--- texinfo.install	2010-04-19 09:34:48 UTC (rev 78098)
+++ texinfo.install	2010-04-19 09:54:27 UTC (rev 78099)
@@ -1,5 +1,5 @@
 infodir=/usr/share/info
-filelist=(info.info.gz info-stnd.info.gz texinfo.gz texinfo-1.gz texinfo-2.gz texinfo-3.gz)
+filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3)
 
 post_install() {
   # Scan *all* info files on install
@@ -10,12 +10,12 @@
 
 post_upgrade() {
   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
 }
 
 pre_remove() {
   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
 }