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

[Eric Bélanger]

    Date: Sunday, April 14, 2013 @ 06:37:15
  Author: eric
Revision: 182745

upgpkg: meld 1.7.1-2

Update optdepends (close FS#34772), Add prepare function

Modified:
  meld/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-14 04:22:21 UTC (rev 182744)
+++ PKGBUILD	2013-04-14 04:37:15 UTC (rev 182745)
@@ -4,7 +4,7 @@
 
 pkgname=meld
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Visual diff and merge tool'
 arch=('any')
 url='http://meldmerge.org/'
@@ -12,19 +12,24 @@
 depends=('pygtk' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('intltool' 'gnome-doc-utils')
 optdepends=('pygtksourceview2: syntax highlighting'
-            'gnome-python: gnome integration')
+            'python2-dbus: open a new tab in an already running instance'
+            'python2-gconf: gnome integration')
 install=meld.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('c5dc21d32405a520cc7969f4de9e2ea356cb0e950fc5a20a9053230313ff3a40')
 
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's/update-/#update-/' Makefile
+  sed -i 's/env python/env python2/' bin/meld
+}
+
 build() {
-    cd $pkgname-$pkgver
-    sed -i 's/update-/#update-/' Makefile
-    make PYTHON=/usr/bin/python2 prefix=/usr
+  cd $pkgname-$pkgver
+  make PYTHON=/usr/bin/python2 prefix=/usr
 }
 
 package() {
-    cd $pkgname-$pkgver
-    make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="$pkgdir" install
-    sed -i -e 's#env python#env python2#' "$pkgdir/usr/bin/meld"
+  cd $pkgname-$pkgver
+  make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="$pkgdir" install
 }