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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 13:59:35
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gconf-editor

Modified: PKGBUILD (1.24 -> 1.25) gconf-editor.install (1.6 -> 1.7)

upgpkg: gconf-editor 2.22.0-1
    GNOME 2.22


----------------------+
 PKGBUILD             |   20 ++++++++++----------
 gconf-editor.install |    5 -----
 2 files changed, 10 insertions(+), 15 deletions(-)


Index: extra/gnome/gconf-editor/PKGBUILD
diff -u extra/gnome/gconf-editor/PKGBUILD:1.24 extra/gnome/gconf-editor/PKGBUILD:1.25
--- extra/gnome/gconf-editor/PKGBUILD:1.24	Sat Sep 22 18:40:19 2007
+++ extra/gnome/gconf-editor/PKGBUILD	Fri Mar 14 13:59:35 2008
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD,v 1.24 2007/09/22 22:40:19 jgc Exp $
+# $Id: PKGBUILD,v 1.25 2008/03/14 17:59:35 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gconf-editor
-pkgver=2.20.0
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.20.0')
-makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.12.0')
+depends=('libgnomeui>=2.22.01')
+makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.12.2')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 options=(!emptydirs)
 install=gconf-editor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.20/gconf-editor-${pkgver}.tar.bz2)
-md5sums=('b686677878b5754ffa8d0a2cc1129988')
+source=(http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.22/gconf-editor-${pkgver}.tar.bz2)
+md5sums=('7ca99aec214dd855b5de7dacc8937055')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-scrollkeeper
+              --localstatedir=/var --disable-scrollkeeper || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
   
-  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
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   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.6 extra/gnome/gconf-editor/gconf-editor.install:1.7
--- extra/gnome/gconf-editor/gconf-editor.install:1.6	Sat Sep 22 18:40:19 2007
+++ extra/gnome/gconf-editor/gconf-editor.install	Fri Mar 14 13:59:35 2008
@@ -20,8 +20,3 @@
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*