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

[Thayer Williams]

    Date: Friday, November 14, 2008 @ 16:50:10
  Author: thayer
Revision: 19099

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

........
  r19098 | thayer | 2008-11-14 13:49:31 -0800 (Fri, 14 Nov 2008) | 2 lines
  
  upgpkg: aspell 0.60.6-4
      fixed info pages and install file
........

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

----------------+
 PKGBUILD       |   17 ++++++++++-------
 aspell.install |   23 +++++++++++++++++++----
 2 files changed, 29 insertions(+), 11 deletions(-)


Property changes on: aspell/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /aspell/trunk:1-18966
   + /aspell/trunk:1-19098

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-14 21:49:31 UTC (rev 19098)
+++ extra-i686/PKGBUILD	2008-11-14 21:50:10 UTC (rev 19099)
@@ -6,8 +6,8 @@
 pkgname=aspell
 pkgver=0.60.6
 _pkgmajorver=0.60
-pkgrel=3
-pkgdesc="a spell checker designed to eventually replace Ispell"
+pkgrel=4
+pkgdesc="A spell checker designed to eventually replace Ispell"
 url="http://aspell.net/"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -19,10 +19,13 @@
 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 || return 1
-  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-i686/aspell.install
===================================================================
--- extra-i686/aspell.install	2008-11-14 21:49:31 UTC (rev 19098)
+++ extra-i686/aspell.install	2008-11-14 21:50:10 UTC (rev 19099)
@@ -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: