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

[Jan Steffens]

    Date: Monday, February 28, 2011 @ 14:38:28
  Author: heftig
Revision: 111714

upgpkg: vino 2.99.2-1
Update to 2.99.2

Modified:
  vino/trunk/PKGBUILD
  vino/trunk/vino.install

--------------+
 PKGBUILD     |   14 +++++---------
 vino.install |   15 ++++++++-------
 2 files changed, 13 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-28 19:37:26 UTC (rev 111713)
+++ PKGBUILD	2011-02-28 19:38:28 UTC (rev 111714)
@@ -2,20 +2,20 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=vino
-pkgver=2.32.1
+pkgver=2.99.2
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libnotify' 'libxtst' 'libunique' 'libsm' 'gconf' 'libsoup' 'telepathy-glib' 'gtk2' 
-         'libgnome-keyring' 'avahi')
+depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 
+         'libgnome-keyring' 'avahi' 'desktop-file-utils')
 makedepends=('intltool' 'networkmanager')
 groups=('gnome-extra')
 url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8ec3cb84216323660d6301e02f5853f928789c20be68ded538dd849eafac4087')
+sha256sums=('37eaf83497dd7428126acf6eb2941255d4024c2634379e7b5a6a2b5c8760dcba')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,9 +29,5 @@
 
 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 vino ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }

Modified: vino.install
===================================================================
--- vino.install	2011-02-28 19:37:26 UTC (rev 111713)
+++ vino.install	2011-02-28 19:38:28 UTC (rev 111714)
@@ -1,17 +1,18 @@
-pkgname=vino
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall vino
+  fi
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+post_remove() {
+  post_install
 }