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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:26:47
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-keyring-manager

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

upgpkg: gnome-keyring-manager 2.18.0-2
Move to /usr


-------------+
 PKGBUILD    |   19 ++++++++++---------
 gkm.install |   14 +++++++-------
 2 files changed, 17 insertions(+), 16 deletions(-)


Index: extra/gnome/gnome-keyring-manager/PKGBUILD
diff -u extra/gnome/gnome-keyring-manager/PKGBUILD:1.3 extra/gnome/gnome-keyring-manager/PKGBUILD:1.4
--- extra/gnome/gnome-keyring-manager/PKGBUILD:1.3	Tue Mar 20 14:17:46 2007
+++ extra/gnome/gnome-keyring-manager/PKGBUILD	Sun Apr 22 12:26:47 2007
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD,v 1.3 2007/03/20 18:17:46 jgc Exp $
+# $Id: PKGBUILD,v 1.4 2007/04/22 16:26:47 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=1
+pkgrel=2
 pkgdesc="Password and key manager application for the GNOME Keyring"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.gnome.org/"
-license=(GPL)
-depends=('libgnomeui>=2.18.1')
-makedepends=('gnome-doc-utils' 'pkgconfig')
+depends=('libgnomeui>=2.18.1-2' 'scrollkeeper')
+makedepends=('gnome-doc-utils>=0.10.3' 'pkgconfig')
 install=gkm.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('05183cdea9d933cb1e9a8f4202c6ffc0')
@@ -18,11 +18,12 @@
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
 
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var  --disable-scrollkeeper
   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/gnome-keyring-manager/gkm.install
diff -u extra/gnome/gnome-keyring-manager/gkm.install:1.1 extra/gnome/gnome-keyring-manager/gkm.install:1.2
--- extra/gnome/gnome-keyring-manager/gkm.install:1.1	Thu Sep 28 16:41:36 2006
+++ extra/gnome/gnome-keyring-manager/gkm.install	Sun Apr 22 12:26:47 2007
@@ -1,10 +1,9 @@
 pkgname=gnome-keyring-manager
 
 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
 }
 
 pre_upgrade() {
@@ -16,18 +15,19 @@
 }
 
 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
 }