[arch-commits] Commit in psi/repos (3 files)

[Pierre Schmitz]

    Date: Monday, May 11, 2009 @ 13:25:45
  Author: pierre
Revision: 39055

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

........
  r39054 | pierre | 2009-05-11 19:25:01 +0200 (Mo, 11 Mai 2009) | 1 line
  
  upgpkg: psi 0.12.1-3
........

Added:
  psi/repos/extra-x86_64/archlinux.patch
    (from rev 39054, psi/trunk/archlinux.patch)
Modified:
  psi/repos/extra-x86_64/	(properties)
  psi/repos/extra-x86_64/PKGBUILD

-----------------+
 PKGBUILD        |   11 +++++++----
 archlinux.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)


Property changes on: psi/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /psi/trunk:1-37392
   + /psi/trunk:1-39054

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-11 17:25:01 UTC (rev 39054)
+++ extra-x86_64/PKGBUILD	2009-05-11 17:25:45 UTC (rev 39055)
@@ -3,18 +3,21 @@
 
 pkgname=psi
 pkgver=0.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Psi - Jabber client"
 url="http://psi-im.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('qca-ossl' 'aspell' 'libxss' 'xdg-utils')
+depends=('qca-ossl' 'qca-gnupg' 'aspell' 'libxss' 'xdg-utils')
 install='psi.install'
-source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2")
-md5sums=('da273e45daef04ffc8338708e96e9173')
+source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
+        'archlinux.patch')
+md5sums=('da273e45daef04ffc8338708e96e9173'
+         'a965c6a4ad1028f14a5897c3f5088ae8')
 
 build() {
 	cd $startdir/src/psi-${pkgver}
+	patch -p1 -i $srcdir/archlinux.patch
 	./configure --prefix=/usr --disable-bundled-qca || return 1
 	make || return 1
 	make INSTALL_ROOT=$startdir/pkg install

Copied: psi/repos/extra-x86_64/archlinux.patch (from rev 39054, psi/trunk/archlinux.patch)
===================================================================
--- extra-x86_64/archlinux.patch	                        (rev 0)
+++ extra-x86_64/archlinux.patch	2009-05-11 17:25:45 UTC (rev 39055)
@@ -0,0 +1,12 @@
+diff -aur psi-0.12.old/src/systeminfo.cpp psi-0.12/src/systeminfo.cpp
+--- psi-0.12.old/src/systeminfo.cpp	2007-04-08 10:37:46.000000000 +0200
++++ psi-0.12/src/systeminfo.cpp	2009-05-11 15:09:14.000000000 +0200
+@@ -89,7 +89,7 @@
+ 		{ LinuxSlackware,	OsAppendFile,	"/etc/slackware-version",	"Slackware Linux"	},
+ 		{ LinuxPLD,		OsUseFile,	"/etc/pld-release",		"PLD Linux"		},
+ 		{ LinuxAurox,		OsUseName,	"/etc/aurox-release",		"Aurox Linux"		},
+-		{ LinuxArch,		OsUseFile,	"/etc/arch-release",		"Arch Linux"		},
++		{ LinuxArch,		OsUseName,	"/etc/arch-release",		"Arch Linux"		},
+ 		{ LinuxLFS,		OsAppendFile,	"/etc/lfs-release",		"LFS Linux"		},
+ 
+ 		// untested