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

[Ionut Biru]

    Date: Thursday, April 5, 2012 @ 06:56:27
  Author: ibiru
Revision: 155712

update to 1.5.4

Modified:
  meld/trunk/PKGBUILD
  meld/trunk/meld.install

--------------+
 PKGBUILD     |   16 ++++++++--------
 meld.install |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-05 10:52:56 UTC (rev 155711)
+++ PKGBUILD	2012-04-05 10:56:27 UTC (rev 155712)
@@ -3,7 +3,7 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=meld
-pkgver=1.5.3
+pkgver=1.5.4
 pkgrel=1
 pkgdesc='Visual diff and merge tool'
 arch=('any')
@@ -14,16 +14,16 @@
 optdepends=('pygtksourceview2: syntax highlighting'
             'gnome-python: gnome integration')
 install=meld.install
-source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.5/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('a27890202584920db941f78c64ba79662b3cdcf5f90c0d2f140a4b52858229b9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('fc6e78dc8cdcff34d14403b1b45dbdf5a8d480e889602cddc0df342b34266612')
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make PYTHON=python2 prefix=/usr
+    cd "$pkgname-$pkgver"
+    make PYTHON=/usr/bin/python2 prefix=/usr
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make PYTHON=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
+    sed -i -e 's#env python#env python2#' "$pkgdir/usr/bin/meld"
 }

Modified: meld.install
===================================================================
--- meld.install	2012-04-05 10:52:56 UTC (rev 155711)
+++ meld.install	2012-04-05 10:56:27 UTC (rev 155712)
@@ -1,5 +1,5 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {