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

[Eric Bélanger]

    Date: Thursday, January 27, 2011 @ 22:53:36
  Author: eric
Revision: 107951

upgpkg: aspell 0.60.6-5
Fixed .install file for case when texinfo is not installed, Set config file directory to /etc (close FS#22496)

Modified:
  aspell/trunk/PKGBUILD
  aspell/trunk/aspell.install

----------------+
 PKGBUILD       |   21 +++++++++------------
 aspell.install |    7 ++++---
 2 files changed, 13 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-28 02:03:46 UTC (rev 107950)
+++ PKGBUILD	2011-01-28 03:53:36 UTC (rev 107951)
@@ -7,33 +7,30 @@
 pkgname=aspell
 pkgver=0.60.6
 _pkgmajorver=0.60
-pkgrel=4
+pkgrel=5
 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)
+options=('!libtool')
 install=aspell.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('bc80f0198773d5c05086522be67334eb')
+sha1sums=('335bcb560e00f59d89ec9e4c4114c325fb0e65f4')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	./configure --prefix=/usr || return 1
-	make || return 1
+	./configure --prefix=/usr --sysconfdir=/etc
+	make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR="${pkgdir}" install
 	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
+		"${pkgdir}/usr/lib/${pkgname}"
 }

Modified: aspell.install
===================================================================
--- aspell.install	2011-01-28 02:03:46 UTC (rev 107950)
+++ aspell.install	2011-01-28 03:53:36 UTC (rev 107951)
@@ -2,22 +2,23 @@
 filelist=(aspell.info aspell-dev.info)
 
 post_install() {
+  echo "==> aspell comes with no default dictionary"
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
-  echo "==> aspell comes with no default dictionary"
 }
 
 post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
 }
 
 pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et: