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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 08:28:15
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-keyring-manager

Modified: PKGBUILD (1.4 -> 1.5) gkm.install (1.2 -> 1.3)

upgpkg: gnome-keyring-manager 2.20.0-1
GNOME 2.20


-------------+
 PKGBUILD    |   15 ++++++++-------
 gkm.install |   19 ++-----------------
 2 files changed, 10 insertions(+), 24 deletions(-)


Index: extra/gnome/gnome-keyring-manager/PKGBUILD
diff -u extra/gnome/gnome-keyring-manager/PKGBUILD:1.4 extra/gnome/gnome-keyring-manager/PKGBUILD:1.5
--- extra/gnome/gnome-keyring-manager/PKGBUILD:1.4	Sun Apr 22 12:26:47 2007
+++ extra/gnome/gnome-keyring-manager/PKGBUILD	Sun Sep 23 08:28:15 2007
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD,v 1.4 2007/04/22 16:26:47 jgc Exp $
+# $Id: PKGBUILD,v 1.5 2007/09/23 12:28:15 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tor Krill <tor at krill.nu>
 
 pkgname=gnome-keyring-manager
-pkgver=2.18.0
-pkgrel=2
+pkgver=2.20.0
+pkgrel=1
 pkgdesc="Password and key manager application for the GNOME Keyring"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnome.org/"
-depends=('libgnomeui>=2.18.1-2' 'scrollkeeper')
-makedepends=('gnome-doc-utils>=0.10.3' 'pkgconfig')
+depends=('libgnomeui>=2.20.0')
+makedepends=('gnome-doc-utils>=0.12.0' 'pkgconfig')
+options=(!emptydirs)
 install=gkm.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('05183cdea9d933cb1e9a8f4202c6ffc0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('61d701888f00c02490c0cd551bf3fcb1')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/gnome-keyring-manager/gkm.install
diff -u extra/gnome/gnome-keyring-manager/gkm.install:1.2 extra/gnome/gnome-keyring-manager/gkm.install:1.3
--- extra/gnome/gnome-keyring-manager/gkm.install:1.2	Sun Apr 22 12:26:47 2007
+++ extra/gnome/gnome-keyring-manager/gkm.install	Sun Sep 23 08:28:15 2007
@@ -1,9 +1,7 @@
 pkgname=gnome-keyring-manager
 
 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}
 }
 
 pre_upgrade() {
@@ -15,20 +13,7 @@
 }
 
 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
-}
-
-post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  gconfpkg --uninstall ${pkgname}
 }
 
 op=$1