From 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 1 May 2011 22:33:26 +0000
Subject: Sun May  1 22:33:26 UTC 2011

---
 extra/vinagre/PKGBUILD        | 25 +++++++++++++------------
 extra/vinagre/vinagre.install | 18 ++++++------------
 2 files changed, 19 insertions(+), 24 deletions(-)

(limited to 'extra/vinagre')

diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index 17c01726d..b81b7c470 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 94920 2010-10-12 14:39:07Z jgc $
+# $Id: PKGBUILD 120639 2011-04-25 18:49:25Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=2.30.3
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/vinagre/"
 install=vinagre.install
-depends=('libgnome-keyring>=2.32.0' 'gtk-vnc>=0.3.10' 'avahi>=0.6.27' 'desktop-file-utils' 'hicolor-icon-theme' 'telepathy-glib>=0.12.0' 'gconf>=2.32.0')
-makedepends=('gnome-doc-utils>=0.20.1' 'intltool' 'gnome-panel-bonobo')
-optdepends=('gnome-panel-bonobo: Remote desktop viewer applet')
+depends=('libgnome-keyring' 'gtk-vnc' 'avahi' 'desktop-file-utils' 'hicolor-icon-theme' 'telepathy-glib' 'dconf' 'libpeas' 'shared-mime-info' 'gnome-icon-theme')
+optdepends=('rdesktop: RDP plugin')
+makedepends=('gtk-doc' 'intltool' 'rdesktop')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/vinagre/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a4c2ec5935c0cea0da1958e7f27a925a03867854cdcaf904ce8c7e405ebe2e5b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # Disable Spice until someone cares (file a bug!)
   ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
-      --libexecdir=/usr/lib/vinagre
+      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
   make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
 
-  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain vinagre ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/vinagre/vinagre.install b/extra/vinagre/vinagre.install
index ffccf65d5..68158ac80 100644
--- a/extra/vinagre/vinagre.install
+++ b/extra/vinagre/vinagre.install
@@ -1,26 +1,20 @@
-pkgname=vinagre
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-mime-database usr/share/mime > /dev/null
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.91.91-2) < 0 )); then
+    usr/sbin/gconfpkg --uninstall vinagre
+  fi
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  post_install
 }
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
+  post_install
 }
-- 
cgit v1.2.3-54-g00ecf