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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:26:37
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gconf-editor

Modified: PKGBUILD (1.21 -> 1.22) gconf-editor.install (1.4 -> 1.5)

upgpkg: gconf-editor 2.18.0-2
Move to /usr


----------------------+
 PKGBUILD             |   26 +++++++++++---------------
 gconf-editor.install |   12 +++++++-----
 2 files changed, 18 insertions(+), 20 deletions(-)


Index: extra/gnome/gconf-editor/PKGBUILD
diff -u extra/gnome/gconf-editor/PKGBUILD:1.21 extra/gnome/gconf-editor/PKGBUILD:1.22
--- extra/gnome/gconf-editor/PKGBUILD:1.21	Tue Mar 20 12:56:06 2007
+++ extra/gnome/gconf-editor/PKGBUILD	Sun Apr 22 12:26:36 2007
@@ -1,32 +1,28 @@
-# $Id: PKGBUILD,v 1.21 2007/03/20 16:56:06 jgc Exp $
+# $Id: PKGBUILD,v 1.22 2007/04/22 16:26:36 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gconf-editor
 pkgver=2.18.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Graphics gconf registry editor"
 arch=(i686 x86_64)
-depends=('libgnomeui>=2.18.1')
-makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils')
+license=('GPL')
+depends=('libgnomeui>=2.18.1-2' 'scrollkeeper')
+makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.10.3')
 url="http://www.gnome.org"
-groups=(gnome-extra)
-license=(GPL)
+groups=('gnome-extra')
 install=gconf-editor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.18/gconf-editor-${pkgver}.tar.bz2)
 md5sums=('cbaefa1ff8a548a3d381c67aed426fb7')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   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
-  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/gconf-editor/gconf-editor.install
diff -u extra/gnome/gconf-editor/gconf-editor.install:1.4 extra/gnome/gconf-editor/gconf-editor.install:1.5
--- extra/gnome/gconf-editor/gconf-editor.install:1.4	Tue Mar 20 12:56:06 2007
+++ extra/gnome/gconf-editor/gconf-editor.install	Sun Apr 22 12:26:37 2007
@@ -1,8 +1,8 @@
 pkgname=gconf-editor
 
 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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -16,14 +16,16 @@
 }
 
 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() {