[arch-commits] Commit in gnome-keyring/trunk (PKGBUILD gnome-keyring.install)

[Ionut Biru]

    Date: Monday, September 27, 2010 @ 05:29:53
  Author: ibiru
Revision: 91457

upgpkg: gnome-keyring 2.31.92-1
update to 2.31.92

Modified:
  gnome-keyring/trunk/PKGBUILD
  gnome-keyring/trunk/gnome-keyring.install

-----------------------+
 PKGBUILD              |   19 ++++++++-----------
 gnome-keyring.install |   16 ++++------------
 2 files changed, 12 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-27 09:29:42 UTC (rev 91456)
+++ PKGBUILD	2010-09-27 09:29:53 UTC (rev 91457)
@@ -2,30 +2,27 @@
 # Maintainer: Jan De Groot <jgc at archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=2.30.3
-pkgrel=2
+pkgver=2.31.92
+pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('gconf>=2.28.1')
+depends=('gtk2>=2.22.0')
 makedepends=('intltool' 'pkgconfig' 'python')
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b24e5c6db621897f2a0045f0083e1f878d617f5c801d389c2ce028a2c67e290b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.31/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('3056252f46b74878c30b4135d0e1b2a9219ab6134a29869fdc8fe2ba3b50a3e9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring \
-      --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs
+      --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \
+      --disable-schemas-compile
   make
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-keyring ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }

Modified: gnome-keyring.install
===================================================================
--- gnome-keyring.install	2010-09-27 09:29:42 UTC (rev 91456)
+++ gnome-keyring.install	2010-09-27 09:29:53 UTC (rev 91457)
@@ -1,19 +1,11 @@
-pkgname=gnome-keyring
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
-pre_upgrade() {
-  pre_remove $1
-}
-
 post_upgrade() {
-  post_install $1
+    post_install $1
 }
 
-pre_remove() {
-  if [ -f usr/share/gconf/${pkgname}.schemas ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
+post_remove() {
+    post_install $1
 }