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

[Jan de Groot]

    Date: Sunday, March 16, 2008 @ 11:08:14
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/seahorse

Modified: PKGBUILD (1.17 -> 1.18) seahorse.install (1.5 -> 1.6)

upgpkg: seahorse 2.22.0-1
    GNOME 2.22


------------------+
 PKGBUILD         |   19 ++++++++++---------
 seahorse.install |    5 -----
 2 files changed, 10 insertions(+), 14 deletions(-)


Index: extra/gnome/seahorse/PKGBUILD
diff -u extra/gnome/seahorse/PKGBUILD:1.17 extra/gnome/seahorse/PKGBUILD:1.18
--- extra/gnome/seahorse/PKGBUILD:1.17	Thu Jan 10 15:53:52 2008
+++ extra/gnome/seahorse/PKGBUILD	Sun Mar 16 11:08:14 2008
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD,v 1.17 2008/01/10 20:53:52 jgc Exp $
+# $Id: PKGBUILD,v 1.18 2008/03/16 15:08:14 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Michel Brabants <michel.linux at tiscali.be>
 
 pkgname=seahorse
-pkgver=2.20.3
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://seahorse.sourceforge.net/"
-depends=('libgnomeui>=2.20.1' 'libnotify>=0.4.4' 'libsoup>=2.2.104' 'gpgme' 'desktop-file-utils' 'zip')
-makedepends=('gettext' 'libldap' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0' 'nautilus>=2.20.0' 'epiphany>=2.20.1' 'gnome-panel>=2.20.3' 'gedit>=2.20.3')
+depends=('libgnomeui>=2.22.01' 'libnotify>=0.4.4' 'libsoup>=2.4.0' 'gpgme' 'desktop-file-utils' 'zip')
+makedepends=('gettext' 'libldap' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0' 'nautilus>=2.22.0' 'epiphany>=2.22.0' 'gnome-panel>=2.22.0' 'gedit>=2.22.0')
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
+replaces=('gnome-keyring-manager')
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.20/seahorse-${pkgver}.tar.bz2)
-md5sums=('6f03b38cb0a52e682c73be49f244f83b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.22/seahorse-${pkgver}.tar.bz2)
+md5sums=('5dd87139d872c51c17de55ab4779a52a')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -24,11 +25,11 @@
 	      --enable-ldap --enable-hkp \
 	      --enable-gedit --enable-nautilus \
 	      --enable-agent --enable-libnotify \
-	      --disable-scrollkeeper --disable-update-mime-database
+	      --disable-scrollkeeper --disable-update-mime-database || return 1
   make || return 1
   make 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
+  install -m755 -d ${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
 }
Index: extra/gnome/seahorse/seahorse.install
diff -u extra/gnome/seahorse/seahorse.install:1.5 extra/gnome/seahorse/seahorse.install:1.6
--- extra/gnome/seahorse/seahorse.install:1.5	Sun Sep 23 09:58:58 2007
+++ extra/gnome/seahorse/seahorse.install	Sun Mar 16 11:08:14 2008
@@ -22,8 +22,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*