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

[Jan de Groot]

    Date: Monday, March 10, 2008 @ 19:27:15
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-keyring

Modified: PKGBUILD (1.22 -> 1.23)

upgpkg: gnome-keyring 2.22.0-1
    GNOME 2.22


----------+
 PKGBUILD |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)


Index: extra/gnome/gnome-keyring/PKGBUILD
diff -u extra/gnome/gnome-keyring/PKGBUILD:1.22 extra/gnome/gnome-keyring/PKGBUILD:1.23
--- extra/gnome/gnome-keyring/PKGBUILD:1.22	Thu Jan 10 14:32:19 2008
+++ extra/gnome/gnome-keyring/PKGBUILD	Mon Mar 10 19:27:15 2008
@@ -1,25 +1,30 @@
-#$Id: PKGBUILD,v 1.22 2008/01/10 19:32:19 jgc Exp $
+#$Id: PKGBUILD,v 1.23 2008/03/10 23:27:15 jgc Exp $
 #Maintainer: Jan De Groot <jgc at archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=2.20.3
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk2>=2.12.5' 'hal>=0.5.10')
+license=('GPL' 'LGPL')
+depends=('gconf>=2.22.0' 'hal>=0.5.10')
 makedepends=('perlxml' 'pkgconfig')
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2205177a168e745fa803c96a4fb62102')
+install=gnome-keyring.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('d27c5bf11579069eb694f93b71364bb4')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --libexecdir=/usr/lib/gnome-keyring \
-	      --with-pam-dir=/lib/security
+	      --with-pam-dir=/lib/security || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make -j1 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 || return 1
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }