[arch-commits] Commit in aspell/repos (3 files)

[Eric Bélanger]

    Date: Friday, November 14, 2008 @ 22:23:18
  Author: eric
Revision: 19135

Merged revisions 18966,19098 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/aspell/trunk

........
  r18966 | thayer | 2008-11-12 16:24:10 -0500 (Wed, 12 Nov 2008) | 2 lines
  
  upgpkg: aspell 0.60.6-3
      pkgbuild cleanup
........
  r19098 | thayer | 2008-11-14 16:49:31 -0500 (Fri, 14 Nov 2008) | 2 lines
  
  upgpkg: aspell 0.60.6-4
      fixed info pages and install file
........

Modified:
  aspell/repos/extra-x86_64/	(properties)
  aspell/repos/extra-x86_64/PKGBUILD
  aspell/repos/extra-x86_64/aspell.install

----------------+
 PKGBUILD       |   28 +++++++++++++++++-----------
 aspell.install |   23 +++++++++++++++++++----
 2 files changed, 36 insertions(+), 15 deletions(-)


Property changes on: aspell/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /aspell/trunk:1-9779
   + /aspell/trunk:1-19134

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-15 02:44:53 UTC (rev 19134)
+++ extra-x86_64/PKGBUILD	2008-11-15 03:23:18 UTC (rev 19135)
@@ -1,25 +1,31 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
 # Contributor: Jochem Kossen <j.kossen at home.nl>
+# Contributor: dorphell <dorphell at archlinux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
+
 pkgname=aspell
 pkgver=0.60.6
 _pkgmajorver=0.60
-pkgrel=2
-pkgdesc="A Free and Open Source spell checker designed to eventually replace Ispell"
-arch=(i686 x86_64)
+pkgrel=4
+pkgdesc="A spell checker designed to eventually replace Ispell"
+url="http://aspell.net/"
+arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('gcc-libs' 'ncurses>=5.6-7')
+optdepends=('perl: to import old dictionaries')
 options=(!libtool)
+install=aspell.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-install=aspell.install
-url="http://aspell.net/"
 md5sums=('bc80f0198773d5c05086522be67334eb')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  ln -s ${pkgname}-${_pkgmajorver} ${startdir}/pkg/usr/lib/${pkgname}
-  rm ${pkgdir}/usr/share/info/dir
+  make DESTDIR=${pkgdir} install || return 1
+  ln -s ${pkgname}-${_pkgmajorver} ${pkgdir}/usr/lib/${pkgname} || return 1
+
+  # cleanup info files
+  rm ${pkgdir}/usr/share/info/dir || return 1
+  gzip ${pkgdir}/usr/share/info/* || return 1
 }

Modified: extra-x86_64/aspell.install
===================================================================
--- extra-x86_64/aspell.install	2008-11-15 02:44:53 UTC (rev 19134)
+++ extra-x86_64/aspell.install	2008-11-15 03:23:18 UTC (rev 19135)
@@ -1,8 +1,23 @@
+infodir=/usr/share/info
+filelist=(aspell.info aspell-dev.info)
+
 post_install() {
-  echo "NOTE: aspell comes with no default dictionary"
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+  echo "==> aspell comes with no default dictionary"
 }
 
-op=$1
-shift
+post_upgrade() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
 
-[ "$(type -t "$op")" = "function" ] && $op "$@"
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et: