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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:04:45
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/libgksu

Modified: PKGBUILD (1.10 -> 1.11) libgksu.install (1.1 -> 1.2)

upgpkg: libgksu 2.0.4-2
Move to /usr


-----------------+
 PKGBUILD        |   19 ++++++++++---------
 libgksu.install |   32 ++++++++++++--------------------
 2 files changed, 22 insertions(+), 29 deletions(-)


Index: extra/gnome/libgksu/PKGBUILD
diff -u extra/gnome/libgksu/PKGBUILD:1.10 extra/gnome/libgksu/PKGBUILD:1.11
--- extra/gnome/libgksu/PKGBUILD:1.10	Sun Mar  4 16:33:59 2007
+++ extra/gnome/libgksu/PKGBUILD	Sun Apr 22 11:04:45 2007
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.10 2007/03/04 21:33:59 jgc Exp $
+# $Id: PKGBUILD,v 1.11 2007/04/22 15:04:45 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libgksu
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="gksu authorization library"
 arch=(i686 x86_64)
 url="http://www.nongnu.org/gksu/index.html"
 license=(GPL)
-depends=('gconf>=2.16.1' 'gnome-keyring>=0.6.0' 'libgtop>=2.14.8' 
-         'libglade>=2.6.0' 'startup-notification>=0.8')
+depends=('gconf>=2.18.0.1-2' 'gnome-keyring>=0.8.1-2' 'libgtop>=2.14.8-2' 
+         'libglade>=2.6.0' 'startup-notification>=0.9')
 makedepends=('gtk-doc' 'pkgconfig')
 options=('nolibtool')
 install=libgksu.install
@@ -18,11 +18,12 @@
 
 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
-  rm -f ${startdir}/pkg/opt/gnome/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
+  rm -f ${startdir}/pkg/usr/lib/*.a
+  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/libgksu/libgksu.install
diff -u extra/gnome/libgksu/libgksu.install:1.1 extra/gnome/libgksu/libgksu.install:1.2
--- extra/gnome/libgksu/libgksu.install:1.1	Thu Oct 12 16:20:43 2006
+++ extra/gnome/libgksu/libgksu.install	Sun Apr 22 11:04:45 2007
@@ -1,22 +1,12 @@
 pkgname=libgksu
 
 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
-  update-desktop-database -q
+  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
 }
 
 pre_upgrade() {
-  if [ "`vercmp 2.0 $2`" = "1" ]; then
-    schemas=/opt/gnome/etc/gconf/schemas/gksu.schemas
-  else
-    schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas
-  fi
-
-  if [ -f ${schemas} ]; then
-    export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
-  fi
+  pre_remove
 }
 
 post_upgrade() {
@@ -24,13 +14,15 @@
 }
 
 pre_remove() {
-  schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
+  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=opt/gnome/etc/gconf/schemas/gksu.schemas
+  fi
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
 }
 
 op=$1