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

Daniel Wallace dwallace at nymeria.archlinux.org
Mon May 13 14:26:24 EDT 2013


    Date: Monday, May 13, 2013 @ 20:26:24
  Author: dwallace
Revision: 90767

upgpkg: notmuch 0.15.2-3

upgpkg: notmuch 0.15.2-3

Modified:
  notmuch/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 18:23:28 UTC (rev 90766)
+++ PKGBUILD	2013-05-13 18:26:24 UTC (rev 90767)
@@ -5,9 +5,9 @@
 # Contributor: Richard Murri <admin at richardmurri.com>
 
 pkgbase=notmuch
-pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime')
+pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
 pkgver=0.15.2
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://notmuchmail.org/"
 license=('GPL3')
@@ -16,47 +16,49 @@
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
 md5sums=('e86968dfcd7ffaf162b7b87de56b7f18')
 
+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"
 
     ./configure --prefix=/usr --sysconfdir=/etc \
-		--includedir=/usr/include
+		--includedir=/usr/include \
+		--without-zsh-completion
+
     make 
+
     (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt"
     make ${pkgname}-mutt.1)
 
-    cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
-
     cd bindings/ruby
     ruby extconf.rb
 
-    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
-    find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
+	cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
 	python setup.py build
 
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
-    #env LD_LIBRARY_PATH="." python2 setup.py build
+	cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
 	python2 setup.py build
 }
 
 package_notmuch-runtime(){
     pkgdesc="Runtime for notmuch and notmuch-mutt"
     depends=('xapian-core' 'gmime' 'talloc')
-    cd "$srcdir/${pkgname}-$pkgver"
+    cd "$srcdir/${pkgbase}-$pkgver"
     make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
+	chmod 755 $pkgdir/usr/bin/notmuch
+}
 
-    install -Dm644 notmuch "$pkgdir/usr/bin/notmuch"
 
+package_notmuch-vim(){
+	pkgdesc="Vim plugins for notmuch"
+	depends=('notmuch-runtime')
     mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax}
-
-    make -C vim prefix="$pkgdir/usr/share/vim/vimfiles" install
-
-    # Remove conflicting zsh completion
-    rm -r ${pkgdir}/usr/share/zsh
+    make -C "$srcdir/$pkgbase-$pkgver/vim" prefix="$pkgdir/usr/share/vim/vimfiles" install
 }
 
 
@@ -90,7 +92,7 @@
 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-runtime-$pkgver"
+    cd "$srcdir/$pkgbase-$pkgver"
 
     install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
     install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz"



More information about the arch-commits mailing list