[arch-commits] Commit in notmuch/trunk (PKGBUILD)

[Daniel Wallace]

    Date: Monday, March 4, 2013 @ 00:08:22
  Author: dwallace
Revision: 85604

upgpkg: notmuch 0.15.2-1

upgpkg: notmuch 0.15.2-1

Modified:
  notmuch/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-03 23:04:15 UTC (rev 85603)
+++ PKGBUILD	2013-03-03 23:08:22 UTC (rev 85604)
@@ -6,7 +6,7 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.15
+pkgver=0.15.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://notmuchmail.org/"
@@ -14,12 +14,13 @@
 makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
 options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a79454042e508c8a1d7aaf1a617526f0')
+md5sums=('e86968dfcd7ffaf162b7b87de56b7f18')
 
 build() {
     cd "$srcdir/${pkgname}-$pkgver"
 
-    ./configure --prefix=/usr --sysconfdir=/etc
+    ./configure --prefix=/usr --sysconfdir=/etc \
+		--includedir=/usr/include
     make 
     (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt"
     make ${pkgname}-mutt.1)
@@ -33,14 +34,14 @@
     cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-    env LD_LIBRARY_PATH="." python setup.py build
+    #env LD_LIBRARY_PATH="." python setup.py build
+    find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
+	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
-
+    find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
+    #env LD_LIBRARY_PATH="." python2 setup.py build
+	python2 setup.py build
 }
 
 package_notmuch-runtime(){
@@ -73,15 +74,17 @@
 
     # Install python bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir"
+    #env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir"
+	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"
+    #env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir"
+	python setup.py install --prefix=/usr --root="$pkgdir"
 
     # Install ruby bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby"
     sed -i -e 's,/site_ruby,,g' Makefile
-    make prefix="${pkgdir}/usr" install
+    make DESTDIR="$pkgdir" includedir=/usr/include install
 
 }