[arch-commits] CVS update of extra/network/pidgin (PKGBUILD pidgin.install)

[Dan McGee]

    Date: Monday, May 14, 2007 @ 00:03:54
  Author: dan
    Path: /home/cvs-extra/extra/network/pidgin

Modified: PKGBUILD (1.2 -> 1.3) pidgin.install (1.1 -> 1.2)

upgpkg: pidgin 2.0.0-2


----------------+
 PKGBUILD       |   12 +++++-------
 pidgin.install |    4 +++-
 2 files changed, 8 insertions(+), 8 deletions(-)


Index: extra/network/pidgin/PKGBUILD
diff -u extra/network/pidgin/PKGBUILD:1.2 extra/network/pidgin/PKGBUILD:1.3
--- extra/network/pidgin/PKGBUILD:1.2	Fri May  4 15:42:51 2007
+++ extra/network/pidgin/PKGBUILD	Mon May 14 00:03:54 2007
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD,v 1.2 2007/05/04 19:42:51 dan Exp $
+# $Id: PKGBUILD,v 1.3 2007/05/14 04:03:54 dan Exp $
 # Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Dan McGee <dan at archlinux.org>
 pkgname=pidgin
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+-based messaging client"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://pidgin.im"
 depends=('startup-notification' 'gtkspell' 'libxss' 'libnetworkmanager' 'gstreamer0.10')
-makedepends=('pkgconfig' 'perlxml' 'tk')
+makedepends=('pkgconfig' 'perlxml' 'tk' 'avahi')
 replaces=('gaim')
 conflicts=('gaim')
 provides=('gaim')
-options=('nolibtool')
+options=(!libtool)
 install=pidgin.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('132355d7e236d9c2820a2668621eef43')
@@ -27,6 +27,4 @@
 	      --disable-debug --enable-nm
   make || return 1
   make DESTDIR=${startdir}/pkg install
-  # Delete bonjour plugin, requires avahi from extra
-  rm -f ${startdir}/pkg/usr/lib/purple-2/libbonjour.so
 }
Index: extra/network/pidgin/pidgin.install
diff -u extra/network/pidgin/pidgin.install:1.1 extra/network/pidgin/pidgin.install:1.2
--- extra/network/pidgin/pidgin.install:1.1	Wed May  2 14:03:44 2007
+++ extra/network/pidgin/pidgin.install	Mon May 14 00:03:54 2007
@@ -1,5 +1,7 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  echo ">> The bonjour plugin is now included in pidgin. If you wish to use"
+  echo ">> it, please install avahi."
 }
 
 post_upgrade() {
@@ -7,7 +9,7 @@
 }
 
 post_remove() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 op=$1