[arch-commits] CVS update of extra/gnome/gossip (PKGBUILD gossip.install)

[Roman Kyrylych]

    Date: Monday, November 12, 2007 @ 10:53:28
  Author: roman
    Path: /home/cvs-extra/extra/gnome/gossip

Modified: PKGBUILD (1.23 -> 1.24) gossip.install (1.5 -> 1.6)

upgpkg: gossip 0.28-1


----------------+
 PKGBUILD       |   38 ++++++++++++++++++++++----------------
 gossip.install |   16 ++--------------
 2 files changed, 24 insertions(+), 30 deletions(-)


Index: extra/gnome/gossip/PKGBUILD
diff -u extra/gnome/gossip/PKGBUILD:1.23 extra/gnome/gossip/PKGBUILD:1.24
--- extra/gnome/gossip/PKGBUILD:1.23	Sun Jun 17 11:57:16 2007
+++ extra/gnome/gossip/PKGBUILD	Mon Nov 12 10:53:27 2007
@@ -1,39 +1,45 @@
-# $Id: PKGBUILD,v 1.23 2007/06/17 15:57:16 jgc Exp $
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# $Id: PKGBUILD,v 1.24 2007/11/12 15:53:27 roman Exp $
+# Maintainer: Roman Kyrylych <roman at archlinux.org>
 # Contributor: Brice Carpentier <brice at dlfp.org>
 
 pkgname=gossip
-pkgver=0.26
+pkgver=0.28
 pkgrel=1
-pkgdesc="a GNOME Jabber client"
-arch=(i686 x86_64)
-license=('GPL')
+pkgdesc="A GNOME Jabber client"
+arch=('i686' 'x86_64')
 url="http://www.imendio.com/projects/gossip/"
-depends=('libxss' 'libnotify>=0.4.4' 'libgnomeui>=2.18.1-2' 'loudmouth>=1.2.3' 'aspell' 'scrollkeeper' 'iso-codes')
-makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.10.3' 'gnome-panel>=2.18.1')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        org.gnome.Gossip.service)
+license=('GPL')
+depends=('libxss' 'libnotify>=0.4.4' 'libgnomeui>=2.18.1-2' 'loudmouth>=1.2.3' \
+         'aspell' 'iso-codes' 'gconf>=2.18.0.1-4' 'hicolor-icon-theme' \
+         'gnome-keyring')
+makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'gnome-panel>=2.18.1')
 install=gossip.install
-md5sums=('b625bd0fb56ceb6da758be2164ff45dd' '7ed8dc152e4bb36bdb73e7e8e56b22b9')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+        org.gnome.Gossip.service)
+md5sums=('2c364a3fffec0fb57c71b6dbab6fa53a'
+         '7ed8dc152e4bb36bdb73e7e8e56b22b9')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
 
+  export CFLAGS="${CFLAGS} -DLM_NO_DEBUG"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gossip \
               --localstatedir=/var \
               --disable-scrollkeeper \
               --enable-libnotify=yes \
-              --enable-dbus=yes
+              --enable-dbus=yes \
+              --enable-gnome-keyring=yes \
+              --enable-aspell=yes
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
        DESTDIR=${startdir}/pkg install
 
   mkdir -p ${startdir}/pkg/usr/share/gconf/schemas  
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas  
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas \
+    ${startdir}/pkg/etc/gconf/schemas/*.schemas
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 
-  mkdir -p ${startdir}/pkg/usr/share/dbus-1/services
-  install -m644 ${startdir}/src/org.gnome.Gossip.service \
-                ${startdir}/pkg/usr/share/dbus-1/services/
+  install -Dm644 ${startdir}/src/org.gnome.Gossip.service \
+    ${startdir}/pkg/usr/share/dbus-1/services/org.gnome.Gossip.service
 }
Index: extra/gnome/gossip/gossip.install
diff -u extra/gnome/gossip/gossip.install:1.5 extra/gnome/gossip/gossip.install:1.6
--- extra/gnome/gossip/gossip.install:1.5	Sun Apr 22 13:44:25 2007
+++ extra/gnome/gossip/gossip.install	Mon Nov 12 10:53:27 2007
@@ -1,9 +1,7 @@
 pkgname=gossip
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -16,20 +14,10 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }