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

[Ronald van Haren]

    Date: Wednesday, November 12, 2008 @ 16:36:04
  Author: ronald
Revision: 18970

fix svn merge conflict

Added:
  fftw/repos/extra-i686/fftw.install
    (from rev 18967, fftw/trunk/fftw.install)
Modified:
  fftw/repos/extra-i686/	(properties)
  fftw/repos/extra-i686/PKGBUILD

--------------+
 PKGBUILD     |   25 +++++++++++++++----------
 fftw.install |   22 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 10 deletions(-)


Property changes on: fftw/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /fftw/trunk:1
   + /fftw/trunk:1-18969

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-12 21:26:22 UTC (rev 18969)
+++ extra-i686/PKGBUILD	2008-11-12 21:36:04 UTC (rev 18970)
@@ -1,32 +1,33 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir at archlinux.org>
 
 pkgname=fftw
-pkgver=3.1.2
-pkgrel=2
-pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size."
+pkgver=3.1.3
+pkgrel=1
+pkgdesc="A C subroutine library for computing the discrete Fourier transform (DFT)"
 arch=("i686" "x86_64")
-license=('GPL2')
+license=('GPL')
 url="http://www.fftw.org/"
 depends=('glibc')
-provides=('fftw3')
 options=(!libtool)
 source=(http://www.fftw.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('08f2e21c9fd02f4be2bd53a62592afa4')
+md5sums=('a3dcba0d30880118310b86833023eea3')
+install=fftw.install
 
 # http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69
 # http://www.fftw.org/faq/section2.html#singleprec
 # http://www.fftw.org/fftw3_doc/Precision.html#Precision
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   # build + install double precision
   ./configure F77=gfortran \
               --prefix=/usr \
               --enable-type-prefix \
 	      --enable-shared
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR=${pkgdir} install || return 1
 
   make clean
 
@@ -37,5 +38,9 @@
 	      --enable-type-prefix \
 	      --enable-shared
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR=${pkgdir} install || return 1
+
+# handle info files
+  rm -f $pkgdir/usr/share/info/dir
+  gzip $pkgdir/usr/share/info/*
 }

Copied: fftw/repos/extra-i686/fftw.install (from rev 18967, fftw/trunk/fftw.install)
===================================================================
--- extra-i686/fftw.install	                        (rev 0)
+++ extra-i686/fftw.install	2008-11-12 21:36:04 UTC (rev 18970)
@@ -0,0 +1,22 @@
+info_dir=/usr/share/info
+info_files=(fftw3.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+        post_install
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+
+
+