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

[Jan de Groot]

    Date: Monday, March 10, 2008 @ 19:04:25
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gconf

Modified: PKGBUILD (1.31 -> 1.32)

upgpkg: gconf 2.22.0-1
    GNOME 2.22, disable support for /opt prefix


----------+
 PKGBUILD |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)


Index: extra/gnome/gconf/PKGBUILD
diff -u extra/gnome/gconf/PKGBUILD:1.31 extra/gnome/gconf/PKGBUILD:1.32
--- extra/gnome/gconf/PKGBUILD:1.31	Wed Oct 17 14:31:54 2007
+++ extra/gnome/gconf/PKGBUILD	Mon Mar 10 19:04:25 2008
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD,v 1.31 2007/10/17 18:31:54 jgc Exp $
+# $Id: PKGBUILD,v 1.32 2008/03/10 23:04:25 jgc Exp $
 # Maintainer:  Jan de Groot <jan at archlinux.org>
 
 pkgname=gconf
-pkgver=2.20.1
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('orbit2>=2.14.10' 'gtk2>=2.12.1' 'libxml2>=2.6.30')
-makedepends=('pkgconfig' 'intltool>=0.36.2' 'gtk-doc>=1.8-4')
+depends=('orbit2>=2.14.12' 'gtk2>=2.12.8-2' 'libxml2>=2.6.30')
+makedepends=('pkgconfig' 'intltool>=0.37.1' 'gtk-doc>=1.9')
 options=('!libtool')
 install=gconf.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.20/GConf-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.22/GConf-${pkgver}.tar.bz2
 	gconf-merge-schema
 	gconfpkg
 	gconf-reload.patch)
-md5sums=('646fc896c6282a8f103365af0fa2e303'
+md5sums=('a56c043afeb1052abaf45407409b0331'
          '1412bafb06f7d8a9601c8f1c4d72cc06'
          '0a43077786fe85ee10002b753752379a'
          'cfcc8e15be7b8a48de4aa34336ff6090')
@@ -30,13 +30,10 @@
   sed -i -e 's/@LDAP_SUPPORT_TRUE@/#/' backends/Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --libexecdir=/usr/lib/GConf \
-	      --disable-static
+	      --disable-static || return 1
   make pkglibdir=/usr/lib/GConf || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -m755 ${startdir}/src/gconf-merge-schema ${startdir}/pkg/usr/bin/
-  install -D -m755 ${startdir}/src/gconfpkg ${startdir}/pkg/usr/sbin/gconfpkg
-
-  # Many post_install/pre_remove scripts call it from there
-  mkdir -p ${startdir}/pkg/opt/gnome/bin
-  ln -sf ../../../usr/bin/gconftool-2 ${startdir}/pkg/opt/gnome/bin/gconftool-2
+  make DESTDIR=${startdir}/pkg install || return 1
+  install -m755 ${startdir}/src/gconf-merge-schema ${startdir}/pkg/usr/bin/ || return 1
+  install -d -m755 ${startdir}/pkg/usr/sbin
+  install -m755 ${startdir}/src/gconfpkg ${startdir}/pkg/usr/sbin/ || return 1
 }