[arch-commits] CVS update of extra/gnome/meld (PKGBUILD meld.install)

[andyrtr at archlinux.org]

    Date: Saturday, February 2, 2008 @ 16:28:19
  Author: andyrtr
    Path: /home/cvs-extra/extra/gnome/meld

Modified: PKGBUILD (1.10 -> 1.11) meld.install (1.4 -> 1.5)

upgpkg: meld 1.1.5.1-2
fixed #9376 and #9410


--------------+
 PKGBUILD     |   13 ++++---------
 meld.install |    1 -
 2 files changed, 4 insertions(+), 10 deletions(-)


Index: extra/gnome/meld/PKGBUILD
diff -u extra/gnome/meld/PKGBUILD:1.10 extra/gnome/meld/PKGBUILD:1.11
--- extra/gnome/meld/PKGBUILD:1.10	Wed Jun 13 13:07:43 2007
+++ extra/gnome/meld/PKGBUILD	Sat Feb  2 16:28:19 2008
@@ -1,25 +1,20 @@
-# $Id: PKGBUILD,v 1.10 2007/06/13 17:07:43 jgc Exp $
+# $Id: PKGBUILD,v 1.11 2008/02/02 21:28:19 andyrtr Exp $
 # Maintainer: 
 pkgname=meld
 pkgver=1.1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Visual diff and merge tool for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://meld.sourceforge.net/"
-depends=('gnome-python')
-makedepends=('perlxml' 'pkgconfig')
+depends=('gnome-python-desktop>=2.20.0-3')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.11.2')
 install=meld.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.1/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('d7366b958f9897f22eb867726b217b5a')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  find . -name GNUmakefile -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-  if [ -f omf.make ]; then
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-
   make prefix=/usr || return 1
   make prefix=/usr DESTDIR=${startdir}/pkg install
   rm -rf ${startdir}/pkg/usr/gnome/share/doc
Index: extra/gnome/meld/meld.install
diff -u extra/gnome/meld/meld.install:1.4 extra/gnome/meld/meld.install:1.5
--- extra/gnome/meld/meld.install:1.4	Wed Apr 25 17:51:38 2007
+++ extra/gnome/meld/meld.install	Sat Feb  2 16:28:19 2008
@@ -1,5 +1,4 @@
 post_install() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   update-desktop-database -q
 }