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

[Lukas Fleischer]

    Date: Thursday, July 9, 2015 @ 14:58:32
  Author: lfleischer
Revision: 136578

upgpkg: notmuch 0.20.2-1

* Upstream update.
* PKGBUILD cleanup.

Modified:
  notmuch/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-09 12:37:16 UTC (rev 136577)
+++ PKGBUILD	2015-07-09 12:58:32 UTC (rev 136578)
@@ -6,7 +6,7 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.20.1
+pkgver=0.20.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://notmuchmail.org/"
@@ -14,33 +14,29 @@
 makedepends=('python2' 'python' 'python-sphinx' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
 options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('314983670db8d004adcf6828966b2c73')
+md5sums=('4042de105925bb693f5f9c750bed28d1')
 
 prepare(){
-    #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
     cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
-
     find "$srcdir/${pkgname}-${pkgver}/bindings/python" -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
     find "$srcdir/${pkgname}-${pkgver}/bindings/python2" -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
 }
 
 build() {
-    cd "$srcdir/${pkgname}-$pkgver"
+    cd "$srcdir/$pkgbase-$pkgver"
 
-    ./configure --prefix=/usr --sysconfdir=/etc \
-		--includedir=/usr/include \
-		--without-zsh-completion
+    ./configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --without-zsh-completion
+    make 
 
-    make 
     make -C "contrib/${pkgbase}-mutt" "${pkgname}-mutt.1"
 
-    cd bindings/ruby
+    cd "$srcdir/$pkgbase-$pkgver/bindings/ruby"
     ruby extconf.rb --vendor
 
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
+    cd "$srcdir/$pkgbase-$pkgver/bindings/python"
     python setup.py build
 
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
+    cd "$srcdir/$pkgbase-$pkgver/bindings/python2"
     python2 setup.py build
 }
 
@@ -47,10 +43,13 @@
 package_notmuch-runtime(){
     pkgdesc="Runtime for notmuch and notmuch-mutt"
     depends=('xapian-core' 'gmime' 'talloc')
-    cd "$srcdir/${pkgbase}-$pkgver"
+
+    cd "$srcdir/$pkgbase-$pkgver"
+
     make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 WITH_EMACS=0 install
-	install -Dm755 notmuch $pkgdir/usr/bin/notmuch
-    rm -rf $pkgdir/usr/share
+
+    install -Dm755 notmuch "$pkgdir/usr/bin/notmuch"
+    rm -rf "$pkgdir/usr/share"
 }
 
 
@@ -58,6 +57,7 @@
     pkgdesc="Vim plugins for notmuch"
     depends=('notmuch-runtime')
     install=notmuch-vim.install
+
     make -C "$srcdir/$pkgbase-$pkgver/vim" DESTDIR="$pkgdir" prefix="/usr/share/vim/vimfiles" install
 }
 
@@ -72,7 +72,7 @@
                 'gnupg: for email encryption')
     install=notmuch.install
 
-    cd "$srcdir/${pkgname}-$pkgver"
+    cd "$srcdir/$pkgbase-$pkgver"
 
     # Install emacs parts
     make DESTDIR="$pkgdir/" install-emacs
@@ -85,17 +85,17 @@
     make -C bindings/ruby exec_prefix=$pkgdir/usr prefix=/usr install
 
     # Install python bindings
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-	python2 setup.py install --prefix=/usr --root="$pkgdir"
+    cd "$srcdir/$pkgbase-$pkgver/bindings/python"
+    python setup.py install --prefix=/usr --root="$pkgdir"
 
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-	python setup.py install --prefix=/usr --root="$pkgdir"
-
+    cd "$srcdir/$pkgbase-$pkgver/bindings/python2"
+    python2 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
 package_notmuch-mutt(){
     pkgdesc="The mail indexer"
     depends=('notmuch-runtime' 'perl-mailtools' 'perl-mail-box' 'perl-term-readline-gnu' 'perl-string-shellquote' 'perl-file-which')
+
     cd "$srcdir/$pkgbase-$pkgver"
 
     install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"