From ad84169d66d20378d28533c216b73c9a6646d6d7 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 2 Oct 2011 23:14:32 +0000
Subject: Sun Oct  2 23:14:32 UTC 2011

---
 extra/seahorse/PKGBUILD         | 19 ++++++++-----------
 extra/seahorse/seahorse.install | 15 ++++++---------
 2 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'extra/seahorse')

diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 3bf6b5430..66873bff2 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 124485 2011-05-22 15:13:07Z ibiru $
+# $Id: PKGBUILD 139427 2011-10-01 19:01:16Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.0.2
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://projects.gnome.org/seahorse/"
-depends=('gtk3' 'gconf' 'libgnome-keyring' 'gnome-keyring' 'libnotify' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme')
+depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
 makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm')
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('78b38d6e7220d1957af34eac79c21423f1f4be066853126d30cc030d8407a1bf')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,15 +23,12 @@ build() {
       --localstatedir=/var --disable-static \
       --enable-ldap --enable-hkp \
       --disable-scrollkeeper \
-      --disable-update-mime-database
+      --disable-update-mime-database \
+      --disable-schemas-compile
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make 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 seahorse ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/seahorse/seahorse.install b/extra/seahorse/seahorse.install
index 97feac3b1..9a98d52e0 100644
--- a/extra/seahorse/seahorse.install
+++ b/extra/seahorse/seahorse.install
@@ -1,24 +1,21 @@
 pkgname=seahorse
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
+      usr/sbin/gconfpkg --uninstall $pkgname
+  fi
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  post_install
 }
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
-- 
cgit v1.2.3-54-g00ecf