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

[Lukas Fleischer]

    Date: Friday, June 19, 2015 @ 23:37:50
  Author: lfleischer
Revision: 135617

upgpkg: notmuch 0.20.1-1

Upstream update.

Added:
  notmuch/trunk/notmuch-vim.install
    (from rev 135616, notmuch/trunk/notmuch.install)
  notmuch/trunk/notmuch.install
Modified:
  notmuch/trunk/PKGBUILD
Deleted:
  notmuch/trunk/notmuch.install

---------------------+
 PKGBUILD            |   37 +++++++++++++------------------------
 notmuch-vim.install |   21 +++++++++++++++++++++
 notmuch.install     |   29 ++++++++---------------------
 3 files changed, 42 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-19 20:53:39 UTC (rev 135616)
+++ PKGBUILD	2015-06-19 21:37:50 UTC (rev 135617)
@@ -1,5 +1,5 @@
-# $Id$
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Maintainer: Lukas Fleischer <lfleischer at archlinux dot org>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
 # Contributor: Richard Murri <admin at richardmurri.com>
@@ -6,8 +6,8 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.19
-pkgrel=2
+pkgver=0.20.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://notmuchmail.org/"
 license=('GPL3')
@@ -14,7 +14,7 @@
 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=('4ff0e560534dfcd48159b96233640239')
+md5sums=('314983670db8d004adcf6828966b2c73')
 
 prepare(){
     #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
@@ -23,6 +23,7 @@
     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"
 
@@ -31,24 +32,16 @@
 		--without-zsh-completion
 
     make 
-    ( pushd "contrib/$pkgbase-deliver"
-    export CPPFLAGS="-I ../../lib"
-    ./autogen.sh
-    ./configure --prefix=/usr --sysconfdir=/etc \
-		--includedir=/usr/include \
-        LDFLAGS="-L$srcdir/$pkgname-$pkgver/lib" \
-        CPPFLAGS="-I$srcdir/$pkgname-$pkgver/lib"
-    make)
     make -C "contrib/${pkgbase}-mutt" "${pkgname}-mutt.1"
 
     cd bindings/ruby
     ruby extconf.rb --vendor
 
-	cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-	python setup.py build
+    cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
+    python setup.py build
 
-	cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-	python2 setup.py build
+    cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
+    python2 setup.py build
 }
 
 package_notmuch-runtime(){
@@ -62,9 +55,9 @@
 
 
 package_notmuch-vim(){
-	pkgdesc="Vim plugins for notmuch"
-	depends=('notmuch-runtime')
-    install=notmuch.install
+    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
 }
 
@@ -77,6 +70,7 @@
                 'python2: for using the python2 bindings'
                 'ruby: for using the ruby bindings'
                 'gnupg: for email encryption')
+    install=notmuch.install
 
     cd "$srcdir/${pkgname}-$pkgver"
 
@@ -90,9 +84,6 @@
     sed -i 's:INSTALL = .*[^D]$:& -D:' bindings/ruby/Makefile
     make -C bindings/ruby exec_prefix=$pkgdir/usr prefix=/usr install
 
-    # Install notmuch-deliver
-    make -C "contrib/${pkgbase}-deliver" DESTDIR="$pkgdir" install
-
     # Install python bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
 	python2 setup.py install --prefix=/usr --root="$pkgdir"
@@ -110,5 +101,3 @@
     install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
     install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
 }
-
-#vim: filetype=PKGBUILD sw=4 ts=4 et

Copied: notmuch/trunk/notmuch-vim.install (from rev 135616, notmuch/trunk/notmuch.install)
===================================================================
--- notmuch-vim.install	                        (rev 0)
+++ notmuch-vim.install	2015-06-19 21:37:50 UTC (rev 135617)
@@ -0,0 +1,21 @@
+update_tags() {
+    echo -n "Updating vim help tags... "
+    /usr/bin/vim --noplugins -u NONE -U NONE \
+        --cmd ":helptags /usr/share/vim/vimfiles/doc" \
+        --cmd ":q" > /dev/null 2>&1
+    echo "done."
+}
+
+post_install() {
+    update_tags
+    echo
+    echo '-> To run type "vim -c NotMuch"'
+}
+
+post_upgrade() {
+    update_tags
+}
+
+post_remove() {
+    update_tags
+}

Deleted: notmuch.install
===================================================================
--- notmuch.install	2015-06-19 20:53:39 UTC (rev 135616)
+++ notmuch.install	2015-06-19 21:37:50 UTC (rev 135617)
@@ -1,21 +0,0 @@
-update_tags() {
-    echo -n "Updating vim help tags... "
-    /usr/bin/vim --noplugins -u NONE -U NONE \
-        --cmd ":helptags /usr/share/vim/vimfiles/doc" \
-        --cmd ":q" > /dev/null 2>&1
-    echo "done."
-}
-
-post_install() {
-    update_tags
-    echo
-    echo '-> To run type "vim -c NotMuch"'
-}
-
-post_upgrade() {
-    update_tags
-}
-
-post_remove() {
-    update_tags
-}

Added: notmuch.install
===================================================================
--- notmuch.install	                        (rev 0)
+++ notmuch.install	2015-06-19 21:37:50 UTC (rev 135617)
@@ -0,0 +1,8 @@
+post_upgrade() {
+  if (( $(vercmp $2 0.20) < 0 )); then
+    cat <<"EOF"
+==> notmuch-deliver was removed in notmuch 0.20.
+==> Please use `notmuch insert` instead.
+EOF
+  fi
+}