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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:10:15
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/libgnomekbd

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

upgpkg: libgnomekbd 2.18.1-2
Move to /usr


---------------------+
 PKGBUILD            |   20 +++++++++-----------
 libgnomekbd.install |   12 +++++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)


Index: extra/gnome/libgnomekbd/PKGBUILD
diff -u extra/gnome/libgnomekbd/PKGBUILD:1.3 extra/gnome/libgnomekbd/PKGBUILD:1.4
--- extra/gnome/libgnomekbd/PKGBUILD:1.3	Mon Apr  9 08:04:07 2007
+++ extra/gnome/libgnomekbd/PKGBUILD	Sun Apr 22 11:10:15 2007
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.3 2007/04/09 12:04:07 jgc Exp $
+# $Id: PKGBUILD,v 1.4 2007/04/22 15:10:15 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libgnomekbd
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome keyboard library"
 url="http://gswitchit.sourceforge.net"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libxklavier>=3.2' 'libgnomeui>=2.18.1')
+depends=('libxklavier>=3.2' 'libgnomeui>=2.18.1-2')
 makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
 install=libgnomekbd.install
@@ -17,17 +17,15 @@
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
   # broken makefiles...
-  rm -f ${startdir}/pkg/opt/gnome/lib/*.a
+  rm -f ${startdir}/pkg/usr/lib/*.a
 
-  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
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  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/libgnomekbd/libgnomekbd.install
diff -u extra/gnome/libgnomekbd/libgnomekbd.install:1.2 extra/gnome/libgnomekbd/libgnomekbd.install:1.3
--- extra/gnome/libgnomekbd/libgnomekbd.install:1.2	Wed Apr  4 17:17:58 2007
+++ extra/gnome/libgnomekbd/libgnomekbd.install	Sun Apr 22 11:10:15 2007
@@ -1,8 +1,8 @@
 pkgname=libgnomekbd
 
 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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -15,13 +15,15 @@
 }
 
 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`    
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`    
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {