[arch-commits] Commit in pidgin/repos (extra-i686 extra-i686/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Monday, August 25, 2008 @ 11:32:00
  Author: andyrtr
Revision: 10278

Merged revisions 7698-10277 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/pidgin/trunk

........
  r10276 | andyrtr | 2008-08-25 15:24:12 +0000 (Mo, 25 Aug 2008) | 1 line
  
  upgpkg: pidgin 2.5.0-1
........

Modified:
  pidgin/repos/extra-i686/	(properties)
  pidgin/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)


Property changes on: pidgin/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /pidgin/trunk:1-7697
   + /pidgin/trunk:1-10277

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-25 15:24:46 UTC (rev 10277)
+++ extra-i686/PKGBUILD	2008-08-25 15:32:00 UTC (rev 10278)
@@ -3,31 +3,26 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pidgin
-pkgver=2.4.3
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
 pkgdesc="A GTK+-based messaging client"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://pidgin.im"
 depends=('startup-notification' 'gtkspell' 'libxss' 'gstreamer0.10'
          'dbus-glib>=0.73' 'ca-certificates' 'gnutls>=2.4.1')
-makedepends=('pkgconfig' 'tk' 'avahi' 'intltool')
+makedepends=('pkgconfig' 'tk' 'avahi' 'intltool' 'python')
 replaces=('gaim')
 conflicts=('gaim')
 provides=('gaim')
-options=(!libtool)
+options=('!libtool')
 install=pidgin.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        certificate-location.patch)
-md5sums=('9e4a5f4ebda16a51fe91ec610286810a'
-         '773d1b944077d88a89bedc595d5f86b0')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('71df6633794de30e57827848cfb61996')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # patch to use system SSL certs
-  patch -Np0 < $srcdir/certificate-location.patch
-
   # gconf won't die with the --disable-schemas-install option
   sed -i -e 's/gconftool-2/no/g' configure.ac || return 1
 
@@ -40,6 +35,7 @@
   automake --add-missing || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
+              --with-ssl-certificates=/etc/ssl/certs \
               --disable-perl --disable-cap \
               --disable-schemas-install \
               --enable-gtkspell --enable-gnutls=yes \