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

Jan de Groot jgc at archlinux.org
Wed Sep 19 19:33:35 UTC 2012


    Date: Wednesday, September 19, 2012 @ 15:33:35
  Author: jgc
Revision: 166833

upgpkg: evolution 3.5.92-1

Update to 3.5.92

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

-------------------+
 PKGBUILD          |   16 +++++-----------
 evolution.install |   13 ++++---------
 2 files changed, 9 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-19 19:30:28 UTC (rev 166832)
+++ PKGBUILD	2012-09-19 19:33:35 UTC (rev 166833)
@@ -3,13 +3,13 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evolution
-pkgver=3.4.4
+pkgver=3.5.92
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
+makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager')
 optdepends=('bogofilter: possible junk filter plugin'
             'spamassassin: possible junk filter plugin')
 groups=('gnome-extra')
@@ -17,7 +17,7 @@
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a')
+sha256sums=('dfead9f5bde36527ed4410e62004e42d4677e319d2c6e02d96ede5406516c25f')
 
 build() {
   cd $pkgname-$pkgver
@@ -29,20 +29,14 @@
       --with-openldap=yes \
       --enable-smime=yes \
       --with-krb5=/usr \
-      --disable-image-inline
+      --disable-schemas-compile
   
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
   make
-  make -C plugins/tnef-attachments
 }
 
 package() {
   cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-  make -C plugins/tnef-attachments DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+  make DESTDIR="$pkgdir" install
 }

Modified: evolution.install
===================================================================
--- evolution.install	2012-09-19 19:30:28 UTC (rev 166832)
+++ evolution.install	2012-09-19 19:33:35 UTC (rev 166833)
@@ -1,24 +1,19 @@
 post_install() {
   glib-compile-schemas /usr/share/glib-2.0/schemas
-  gconfpkg --install evolution
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove
+  if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then
+    gconfpkg --uninstall evolution
+  fi
 }
 
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  gconfpkg --uninstall evolution
-}
-
 post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  post_install
 }




More information about the arch-commits mailing list