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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 06:24:19
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/libgnomekbd

Modified: PKGBUILD (1.5 -> 1.6) libgnomekbd.install (1.3 -> 1.4)

upgpkg: libgnomekbd 2.20.0-1
GNOME 2.20


---------------------+
 PKGBUILD            |   12 ++++++------
 libgnomekbd.install |   13 ++-----------
 2 files changed, 8 insertions(+), 17 deletions(-)


Index: extra/gnome/libgnomekbd/PKGBUILD
diff -u extra/gnome/libgnomekbd/PKGBUILD:1.5 extra/gnome/libgnomekbd/PKGBUILD:1.6
--- extra/gnome/libgnomekbd/PKGBUILD:1.5	Sun May 27 11:07:10 2007
+++ extra/gnome/libgnomekbd/PKGBUILD	Sun Sep 23 06:24:19 2007
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD,v 1.5 2007/05/27 15:07:10 jgc Exp $
+# $Id: PKGBUILD,v 1.6 2007/09/23 10:24:19 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libgnomekbd
-pkgver=2.18.2
+pkgver=2.20.0
 pkgrel=1
 pkgdesc="Gnome keyboard library"
 url="http://gswitchit.sourceforge.net"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libxklavier>=3.2' 'libgnomeui>=2.18.1-2')
+depends=('libxklavier>=3.3' 'libgnomeui>=2.20.0')
 makedepends=('perlxml' 'pkgconfig')
-options=('nolibtool')
+options=('!libtool' '!emptydirs')
 install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e99a9f1de689ba3c0ad03fadd55dd3e4')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0b495d355e25c3531419cb3996be7e28')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/libgnomekbd/libgnomekbd.install
diff -u extra/gnome/libgnomekbd/libgnomekbd.install:1.3 extra/gnome/libgnomekbd/libgnomekbd.install:1.4
--- extra/gnome/libgnomekbd/libgnomekbd.install:1.3	Sun Apr 22 11:10:15 2007
+++ extra/gnome/libgnomekbd/libgnomekbd.install	Sun Sep 23 06:24:19 2007
@@ -1,8 +1,7 @@
 pkgname=libgnomekbd
 
 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
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -15,15 +14,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
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {