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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:44:25
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gossip

Modified: PKGBUILD (1.20 -> 1.21) gossip.install (1.4 -> 1.5)

upgpkg: gossip 0.24-1


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


Index: extra/gnome/gossip/PKGBUILD
diff -u extra/gnome/gossip/PKGBUILD:1.20 extra/gnome/gossip/PKGBUILD:1.21
--- extra/gnome/gossip/PKGBUILD:1.20	Tue Dec 26 07:18:44 2006
+++ extra/gnome/gossip/PKGBUILD	Sun Apr 22 13:44:25 2007
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD,v 1.20 2006/12/26 12:18:44 arjan Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.21 2007/04/22 17:44:25 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Brice Carpentier <brice at dlfp.org>
 
 pkgname=gossip
-pkgver=0.20
+pkgver=0.24
 pkgrel=1
 pkgdesc="a gnome jabber client"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.imendio.com/projects/gossip/"
-depends=('libxss' 'libnotify>=0.4.2' 'libgnomeui>=2.16.0' 
-	 'loudmouth>=1.0.5' 'aspell')
-makedepends=('pkgconfig' 'intltool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.20/${pkgname}-${pkgver}.tar.bz2)
+depends=('libxss' 'libnotify>=0.4.4' 'libgnomeui>=2.18.1-2' 'loudmouth>=1.0.5' 'aspell' 'scrollkeeper')
+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)
 install=gossip.install
-md5sums=('a8c6eb8cf31f28144283943db4b9f960')
+md5sums=('79a91572906bdcbfe96208e8e06aacf7')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/${pkgname}-${pkgver}
 
-  ./configure \
-  	--prefix=/opt/gnome \
-  	--disable-scrollkeeper \
-	--enable-libnotify=yes \
-	--enable-dbus=yes
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gossip \
+              --localstatedir=/var \
+              --disable-scrollkeeper \
+              --enable-libnotify=yes \
+              --enable-dbus=yes
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
        DESTDIR=${startdir}/pkg install
 
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas  
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas  
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
+  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  
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/gossip/gossip.install
diff -u extra/gnome/gossip/gossip.install:1.4 extra/gnome/gossip/gossip.install:1.5
--- extra/gnome/gossip/gossip.install:1.4	Thu Jun 22 17:40:34 2006
+++ extra/gnome/gossip/gossip.install	Sun Apr 22 13:44:25 2007
@@ -1,10 +1,10 @@
 pkgname=gossip
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  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
-  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -16,19 +16,21 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  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=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {
-  update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 op=$1