[arch-commits] Commit in meld/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Giovanni Scafora]

    Date: Saturday, April 18, 2009 @ 05:26:00
  Author: giovanni
Revision: 35927

Merged revisions 35915 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/meld/trunk

........
  r35915 | douglas | 2009-04-18 00:47:55 -0700 (sab, 18 apr 2009) | 2 lines
  
  upgpkg: meld 1.3.0-1
      Updated for i686: 1.3.0
........

Modified:
  meld/repos/extra-x86_64/	(properties)
  meld/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)


Property changes on: meld/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /meld/trunk:1-19514
   + /meld/trunk:1-35924

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-18 09:25:33 UTC (rev 35926)
+++ extra-x86_64/PKGBUILD	2009-04-18 09:26:00 UTC (rev 35927)
@@ -1,24 +1,21 @@
 # $Id$
-# Maintainer: 
+# Maintainer: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=meld
-pkgver=1.2.1
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="Visual diff and merge tool for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://meld.sourceforge.net/"
-depends=('gnome-python-desktop>=2.22.0' 'gtksourceview')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'intltool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.2/${pkgname}-${pkgver}.tar.gz
-	meld_buildfix.diff)
+depends=('gnome-python-desktop' 'gtksourceview')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils' 'intltool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.3/${pkgname}-${pkgver}.tar.gz)
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ../meld_buildfix.diff || return 1
   make prefix=/usr || return 1
   make prefix=/usr DESTDIR=${pkgdir} install || return 1
   rm -rf ${pkgdir}/usr/gnome/share/doc
 }
-md5sums=('4382a696b66440a40486b95dabfafb8b'
-         '074042dcafc9869a4dad69e0d1d92b0e')
+md5sums=('5cfc42077ba0bb9f03d6e568dbd906d7')