1 files changed, 21 insertions, 13 deletions
diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index b3ff31567..58599073c 100755
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -4,13 +4,13 @@
 
 pkgname=notmuch
 pkgver=0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Notmuch is not much of an email program"
 arch=(i686 x86_64 mips64el)
 url="http://notmuchmail.org/"
 license=('GPL3')
 depends=('xapian-core' 'gmime' 'talloc')
-makedepends=('python2' 'emacs' 'gnupg' 'ruby' 'pkgconfig')
+makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig')
 optdepends=('emacs: for using the emacs interface'
             'vim: for using the vim interface'
             'python2: for using the python bindings'
@@ -21,7 +21,7 @@ options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
 
 build() {
-  cd "$srcdir/${pkgname}-"*
+  cd "$srcdir/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --sysconfdir=/etc
   make 
@@ -29,15 +29,26 @@ build() {
   cd bindings/ruby
   ruby extconf.rb
   make
+
+  cp -r $srcdir/${pkgname}-${pkgver}/bindings/python{,2}
+
+  cd $srcdir/${pkgname}-${pkgver}/bindings/python
+  env LD_LIBRARY_PATH="." python setup.py build
+
+  cd $srcdir/${pkgname}-${pkgver}/bindings/python2
+  find "." -name '*.py' -print0 |xargs -0 \
+      sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
+      -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
+  env LD_LIBRARY_PATH="." python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/${pkgname}-"*
+  cd "$srcdir/${pkgname}-${pkgver}"
   make test
 }
 
 package(){
-  cd "$srcdir/${pkgname}-"*
+  cd "$srcdir/${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
 
   install -D notmuch $pkgdir/usr/sbin/notmuch
@@ -48,17 +59,14 @@ package(){
 
   # Install python bindings
 
-  cd $srcdir/${pkgname}-*/bindings/python
-
-  find "." -name '*.py' -print0 |xargs -0 \
-      sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-      -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-#  ln -s ../../lib/libnotmuch.so.1 libnotmuch.so.1
-  env LD_LIBRARY_PATH="." python2 setup.py build
+  cd $srcdir/${pkgname}-${pkgver}/bindings/python2
   env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root=$pkgdir
 
+  cd $srcdir/${pkgname}-${pkgver}/bindings/python
+  env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root=$pkgdir
+
 # Install ruby bindings
-  cd $srcdir/${pkgname}-*/bindings/ruby
+  cd $srcdir/${pkgname}-${pkgver}/bindings/ruby
   sed -i -e 's,/site_ruby,,g' Makefile
   make prefix=${pkgdir}/usr install