[arch-commits] Commit in empathy/trunk (PKGBUILD empathy.install)

[Ionut Biru]

    Date: Monday, September 27, 2010 @ 05:18:35
  Author: ibiru
Revision: 91432

upgpkg: empathy 2.31.92-1
update to 2.31.92

Modified:
  empathy/trunk/PKGBUILD
  empathy/trunk/empathy.install

-----------------+
 PKGBUILD        |   20 ++++++++------------
 empathy.install |   29 ++++++++---------------------
 2 files changed, 16 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-27 09:18:02 UTC (rev 91431)
+++ PKGBUILD	2010-09-27 09:18:35 UTC (rev 91432)
@@ -1,13 +1,15 @@
 # $Id$
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 pkgname=empathy
-pkgver=2.30.3
+pkgver=2.31.92
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Empathy"
 license=('GPL2')
-depends=('iso-codes' 'telepathy-mission-control>=5.4.1' 'telepathy-farsight>=0.0.14' 'libcanberra' 'libnotify' 'libunique>=1.1.6' 'libwebkit>=1.2.3' 'evolution-data-server>=2.30.3')
+depends=('telepathy-glib>=0.12.0' 'telepathy-mission-control>=5.6.0' 'folks>=0.2.0' 'telepathy-logger>=0.1.5' 'telepathy-farsight>=0.0.15'
+         'gnome-keyring>=2.31.92' 'gnutls' 'gconf>=2.31.91' 'evolution-data-server>=2.31.92' 'libcanberra>=0.25' 'libnotify' 'libunique'
+         'enchant' 'iso-codes' 'libwebkit')
 makedepends=('pkg-config' 'intltool' 'gnome-doc-utils>=0.20.1' 'nautilus-sendto')
 optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-butterfly: MSN support'
@@ -18,22 +20,16 @@
 options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('5965434fcc05f7ec3cd32d9128b03ac20e96624b0035d329abf72decd70c5def')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.31/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('c3f0fbc4b5d05b7730c7a41f92ddf3a7e8ca3edbb60df233a318e96511ba36f8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
       --sysconfdir=/etc  \
       --libexecdir=/usr/lib/empathy \
-      --disable-schemas-install
+      --disable-schemas-compile
   make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
-      DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 
-  # Merge schemas file in a single file and remove trash
-  mkdir -p "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \
-      --domain empathy "${pkgdir}/etc/gconf/schemas/"*.schemas
-  rm -rf "${pkgdir}/etc/gconf"
 }

Modified: empathy.install
===================================================================
--- empathy.install	2010-09-27 09:18:02 UTC (rev 91431)
+++ empathy.install	2010-09-27 09:18:35 UTC (rev 91432)
@@ -1,29 +1,16 @@
-pkgname=empathy
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  cat << EOF
-> To use Empathy you need to install at least one Telepathy connection 
-manager.
->
-EOF
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    echo "To use Empathy you need to install at least one Telepathy connection manager."
 }
 
-pre_upgrade() {
-  pre_remove $1
-}
-
 post_upgrade() {
-  post_install $1
+    post_install $1
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }