[arch-commits] CVS update of extra/network/gajim (9283.diff PKGBUILD)

[Simo Leone]

    Date: Wednesday, February 13, 2008 @ 14:20:09
  Author: simo
    Path: /home/cvs-extra/extra/network/gajim

   Added: 9283.diff (1.1)
Modified: PKGBUILD (1.15 -> 1.16)

upgpkg: gajim 0.11.4-2
    Fix FS#9418


-----------+
 9283.diff |   11 +++++++++++
 PKGBUILD  |   13 +++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)


Index: extra/network/gajim/9283.diff
diff -u /dev/null extra/network/gajim/9283.diff:1.1
--- /dev/null	Wed Feb 13 14:20:09 2008
+++ extra/network/gajim/9283.diff	Wed Feb 13 14:20:09 2008
@@ -0,0 +1,11 @@
+Index: trunk/src/common/helpers.py
+===================================================================
+--- trunk/src/common/helpers.py (revision 9282)
++++ trunk/src/common/helpers.py (revision 9283)
+@@ -794,5 +794,5 @@
+ 
+ 		# our last chance, ask uname and strip it
+-		uname_output = get_output_of_command('uname -a | cut -d" " -f1,3')
++		uname_output = get_output_of_command('uname -sr')
+ 		if uname_output is not None:
+ 			return uname_output[0] # only first line
Index: extra/network/gajim/PKGBUILD
diff -u extra/network/gajim/PKGBUILD:1.15 extra/network/gajim/PKGBUILD:1.16
--- extra/network/gajim/PKGBUILD:1.15	Sun Jan 20 00:16:53 2008
+++ extra/network/gajim/PKGBUILD	Wed Feb 13 14:20:09 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.15 2008/01/20 05:16:53 eric Exp $
+# $Id: PKGBUILD,v 1.16 2008/02/13 19:20:09 simo Exp $
 # Maintainer: simo <simo at archlinux.org>
 # Contributor: Nikos Kouremenos <kourem at gmail.com>
 pkgname=gajim
 pkgver=0.11.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Jabber client written in PyGTK"
 arch=(i686 x86_64)
 url="http://www.gajim.org/"
@@ -12,11 +12,16 @@
 makedepends=('gettext' 'perlxml')
 install=gajim.install
 options=(!libtool)
-source=(http://www.gajim.org/downloads/gajim-$pkgver.tar.gz)
-md5sums=('ddcd445c82299535cad12401d877f7cc')
+source=(http://www.gajim.org/downloads/gajim-$pkgver.tar.gz 9283.diff)
+md5sums=('ddcd445c82299535cad12401d877f7cc'
+         '4f6b939e4fa3038ed62ceab4b52a40fa')
 
 build() {
   cd $startdir/src/gajim-$pkgver
+  
+  # this will be included in gajim 0.12
+  patch -p1 < $startdir/src/9283.diff
+  
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=$startdir/pkg install