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

[Jan Steffens]

    Date: Monday, May 9, 2016 @ 22:18:21
  Author: heftig
Revision: 267276

3.20.2-1

Modified:
  evolution/trunk/PKGBUILD
Deleted:
  evolution/trunk/evolution.install

-------------------+
 PKGBUILD          |   28 ++++++++++++++++------------
 evolution.install |   19 -------------------
 2 files changed, 16 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-09 20:00:04 UTC (rev 267275)
+++ PKGBUILD	2016-05-09 20:18:21 UTC (rev 267276)
@@ -3,17 +3,20 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgbase=evolution
-pkgname=('evolution' 'evolution-bogofilter' 'evolution-spamassassin')
-pkgver=3.20.1
+pkgname=(evolution evolution-bogofilter evolution-spamassassin)
+pkgver=3.20.2
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
+url="https://wiki.gnome.org/Apps/Evolution"
 arch=(i686 x86_64)
 license=(GPL)
-makedepends=(intltool itstool docbook-xsl networkmanager bogofilter spamassassin highlight gnome-desktop evolution-data-server libcanberra libpst libytnef desktop-file-utils dconf gtkspell3 webkitgtk libcryptui gnome-common gtk-doc)
-options=('!emptydirs')
-url=https://wiki.gnome.org/Apps/Evolution
+depends=(gnome-desktop evolution-data-server libcanberra libpst libytnef
+         dconf gtkspell3 libcryptui webkitgtk)
+makedepends=(intltool itstool docbook-xsl networkmanager bogofilter
+             spamassassin highlight gnome-common gtk-doc)
+options=(!emptydirs)
 source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('029567e20fa62263c5fcd2e7f3a0dff96364b647cf9d36a5b99a3abe3b0027d3')
+sha256sums=('66fa6e18c4e6a29c44870d5786e4dbb82507a8254bca9e27e802625081fca630')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -38,13 +41,10 @@
 }
 
 package_evolution() {
-  depends=(gnome-desktop evolution-data-server libcanberra libpst libytnef
-           desktop-file-utils dconf gtkspell3 libcryptui webkitgtk)
-  install=evolution.install
   optdepends=('highlight: text highlight plugin'
               'evolution-spamassassin: Spamassassin spam check plugin'
               'evolution-bogofilter: Bogofilter spam check plugin')
-  groups=('gnome-extra')
+  groups=(gnome-extra)
 
   cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
@@ -58,13 +58,17 @@
 
 
 package_evolution-bogofilter() {
-  depends=("evolution=$pkgver" 'bogofilter')
+  pkgdesc="Spam filtering for Evolution, using Bogofilter"
+  depends=("evolution=$pkgver" bogofilter)
+
   install -Dm755 plugins/module-bogofilter.so "$pkgdir/usr/lib/evolution/modules/module-bogofilter.so"
   install -Dm644 plugins/evolution-bogofilter.metainfo.xml "$pkgdir/usr/share/appdata/evolution-bogofilter.metainfo.xml"
 }
 
 package_evolution-spamassassin() {
-  depends=("evolution=$pkgver" 'spamassassin')
+  pkgdesc="Spam filtering for Evolution, using SpamAssassin"
+  depends=("evolution=$pkgver" spamassassin)
+
   install -Dm755 plugins/module-spamassassin.so "$pkgdir/usr/lib/evolution/modules/module-spamassassin.so"
   install -Dm644 plugins/evolution-spamassassin.metainfo.xml "$pkgdir/usr/share/appdata/evolution-spamassassin.metainfo.xml"
 }

Deleted: evolution.install
===================================================================
--- evolution.install	2016-05-09 20:00:04 UTC (rev 267275)
+++ evolution.install	2016-05-09 20:18:21 UTC (rev 267276)
@@ -1,19 +0,0 @@
-post_install() {
-  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() {
-  if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then
-    gconfpkg --uninstall evolution
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}