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

[Ionut Biru]

    Date: Friday, September 2, 2011 @ 10:49:46
  Author: ibiru
Revision: 136873

update to 3.1.90

Modified:
  seahorse/trunk/PKGBUILD
  seahorse/trunk/seahorse.install

------------------+
 PKGBUILD         |   17 +++++++----------
 seahorse.install |   15 ++++++---------
 2 files changed, 13 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-02 14:49:29 UTC (rev 136872)
+++ PKGBUILD	2011-09-02 14:49:46 UTC (rev 136873)
@@ -3,19 +3,19 @@
 # Contributor: Michel Brabants <michel.linux at tiscali.be>
 
 pkgname=seahorse
-pkgver=3.0.2
+pkgver=3.1.90
 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=('e866d3dd46d3e1e303bc76fa47073a0fb48b8825fe9839157ac37916e4cd19a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,15 +23,12 @@
       --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
 }

Modified: seahorse.install
===================================================================
--- seahorse.install	2011-09-02 14:49:29 UTC (rev 136872)
+++ seahorse.install	2011-09-02 14:49:46 UTC (rev 136873)
@@ -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
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }