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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 09:58:58
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/seahorse

Modified: PKGBUILD (1.14 -> 1.15) seahorse.install (1.4 -> 1.5)

upgpkg: seahorse 2.20.0-1
GNOME 2.20


------------------+
 PKGBUILD         |   17 ++++++++---------
 seahorse.install |   18 ++----------------
 2 files changed, 10 insertions(+), 25 deletions(-)


Index: extra/gnome/seahorse/PKGBUILD
diff -u extra/gnome/seahorse/PKGBUILD:1.14 extra/gnome/seahorse/PKGBUILD:1.15
--- extra/gnome/seahorse/PKGBUILD:1.14	Wed May 30 16:35:13 2007
+++ extra/gnome/seahorse/PKGBUILD	Sun Sep 23 09:58:58 2007
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD,v 1.14 2007/05/30 20:35:13 jgc Exp $
+# $Id: PKGBUILD,v 1.15 2007/09/23 13:58:58 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Michel Brabants <michel.linux at tiscali.be>
 
 pkgname=seahorse
-pkgver=1.0.1
-pkgrel=3
+pkgver=2.20.0
+pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://seahorse.sourceforge.net/"
-depends=('libgnomeui>=2.18.1-2' 'libnotify>=0.4.4' 'libsoup>=2.2.100-2' 'libgnomeprintui>=2.18.0' 'gtksourceview>=1.8.5-2' 'gpgme' 'scrollkeeper' 'desktop-file-utils' 'zip')
-makedepends=('gedit>=2.18.1' 'gettext' 'libldap' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3' 'nautilus>=2.18.1' 'epiphany>=2.18.1-2' 'gnome-panel>=2.18.1')
-options=('!libtool')
+depends=('libgnomeui>=2.20.0' 'libnotify>=0.4.4' 'libsoup>=2.2.100-2' 'gpgme' 'desktop-file-utils' 'zip')
+makedepends=('gettext' 'libldap' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0' 'nautilus>=2.20.0' 'epiphany>=2.20.0' 'gnome-panel>=2.20.0')
+options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/1.0/seahorse-${pkgver}.tar.bz2)
-md5sums=('687b44dff0cf765d193af79de7fe856f')
+source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.20/seahorse-${pkgver}.tar.bz2)
+md5sums=('d4447cdc2e04905732dd792b5236caa6')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  sed -i -e 's/seahorse-daemon/seahorse-agent/g' agent/Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --enable-ldap --enable-hkp \
Index: extra/gnome/seahorse/seahorse.install
diff -u extra/gnome/seahorse/seahorse.install:1.4 extra/gnome/seahorse/seahorse.install:1.5
--- extra/gnome/seahorse/seahorse.install:1.4	Sun Apr 22 12:05:11 2007
+++ extra/gnome/seahorse/seahorse.install	Sun Sep 23 09:58:58 2007
@@ -1,11 +1,8 @@
 pkgname=seahorse
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  scrollkeeper-update -q -p var/lib/scrollkeeper 
+  usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
-  update-mime-database usr/share/mime
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -18,22 +15,11 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
   update-desktop-database -q
-  update-mime-database usr/share/mime
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }