[arch-commits] Commit in seahorse/repos (3 files)

[Jan de Groot]

    Date: Monday, October 12, 2009 @ 04:24:49
  Author: jgc
Revision: 55179

Merged revisions 55177 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/seahorse/trunk

........
  r55177 | jgc | 2009-10-12 10:24:17 +0200 (Mon, 12 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Modified:
  seahorse/repos/extra-x86_64/	(properties)
  seahorse/repos/extra-x86_64/PKGBUILD
Deleted:
  seahorse/repos/extra-x86_64/seahorse-2.26.2-gpgme-lfs.patch

---------------------------------+
 PKGBUILD                        |   25 +++++++++---------------
 seahorse-2.26.2-gpgme-lfs.patch |   39 --------------------------------------
 2 files changed, 10 insertions(+), 54 deletions(-)


Property changes on: seahorse/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /seahorse/trunk:1-52430
   + /seahorse/trunk:1-55178

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-12 08:24:35 UTC (rev 55178)
+++ extra-x86_64/PKGBUILD	2009-10-12 08:24:49 UTC (rev 55179)
@@ -3,33 +3,28 @@
 # Contributor: Michel Brabants <michel.linux at tiscali.be>
 
 pkgname=seahorse
-pkgver=2.26.2
-pkgrel=3
+pkgver=2.28.0
+pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://seahorse.sourceforge.net/"
-depends=('gnome-keyring>=2.26.1' 'libglade>=2.6.4' 'avahi>=0.6.25' 'libnotify>=0.4.5' \
-         'libsoup>=2.26.2' 'gpgme' 'desktop-file-utils' 'zip')
-makedepends=('gettext' 'libldap>=2.4.18' 'intltool' 'pkgconfig' 'gnome-doc-utils>=0.16.0' 
-             'openssh' 'libsm')
+depends=('gnome-keyring>=2.28.0' 'avahi>=0.6.25' 'libnotify>=0.4.5' 'libsoup>=2.27.92' 'gpgme>=1.2.0' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils>=0.17.5' 'openssh' 'libsm')
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 replaces=('gnome-keyring-manager')
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.26/seahorse-${pkgver}.tar.bz2
-        seahorse-2.26.2-gpgme-lfs.patch)
-md5sums=('c5126bd7ddfda3317daa71c06f261034'
-         '20d527f7531cc7182964ef92895c9b28')
+source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.28/seahorse-${pkgver}.tar.bz2)
+sha256sums=('63d40fea2b8fb52d1b29d10bee2c5c3a6722516a770793979eb062ed53588a3e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/seahorse-2.26.2-gpgme-lfs.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --enable-ldap --enable-hkp \
-	      --enable-libnotify \
-	      --disable-scrollkeeper --disable-update-mime-database || return 1
+      --localstatedir=/var --disable-static \
+      --enable-ldap --enable-hkp \
+      --enable-libnotify \
+      --disable-scrollkeeper --disable-update-mime-database || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 

Deleted: extra-x86_64/seahorse-2.26.2-gpgme-lfs.patch
===================================================================
--- extra-x86_64/seahorse-2.26.2-gpgme-lfs.patch	2009-10-12 08:24:35 UTC (rev 55178)
+++ extra-x86_64/seahorse-2.26.2-gpgme-lfs.patch	2009-10-12 08:24:49 UTC (rev 55179)
@@ -1,39 +0,0 @@
-diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c seahorse-2.26.2/pgp/seahorse-gpg-op.c
---- seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c	2009-04-20 11:35:00.000000000 -0400
-+++ seahorse-2.26.2/pgp/seahorse-gpg-op.c	2009-07-10 09:43:31.550476889 -0400
-@@ -18,7 +18,9 @@
-  * 59 Temple Place, Suite 330,
-  * Boston, MA 02111-1307, USA.
-  */
-- 
-+
-+#include "config.h"
-+
- #include <glib.h>
- #include <gpgme.h>
- #include <string.h>
-diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c seahorse-2.26.2/pgp/seahorse-gpg-options.c
---- seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c	2009-04-20 11:35:00.000000000 -0400
-+++ seahorse-2.26.2/pgp/seahorse-gpg-options.c	2009-07-10 09:36:16.012409729 -0400
-@@ -19,6 +19,11 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include "config.h"
-+
-+#include "seahorse-util.h"
-+#include "seahorse-context.h"
-+
- #include <sys/param.h>
- #include <sys/wait.h>
- #include <sys/file.h>
-@@ -31,9 +36,6 @@
- #include <unistd.h>
- #include <sys/stat.h>
- 
--#include "seahorse-util.h"
--#include "seahorse-context.h"
--
- #include "pgp/seahorse-gpgme.h"
- #include "pgp/seahorse-gpg-options.h"
-