From 98bf2ac3fdd6f7bcb6ce45c932fc13c07fecc03f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 25 Apr 2012 00:01:35 +0000
Subject: Wed Apr 25 00:01:35 UTC 2012

---
 extra/vinagre/PKGBUILD        | 23 ++++++++++-------------
 extra/vinagre/vinagre.install | 10 ++--------
 2 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'extra/vinagre')

diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index c25b490eb..5b33a9b9d 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 142898 2011-11-17 18:35:12Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Allan McRae <mcrae_allan@hotmail.com>
+# $Id: PKGBUILD 156998 2012-04-23 09:10:54Z ibiru $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.2.2
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64')
@@ -14,24 +15,20 @@ install=vinagre.install
 depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
 optdepends=('openssh: SSH plugin'
             'rdesktop: RDP plugin')
-makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh')
+makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd')
+sha256sums=('5b79bbdafe57e1ceaeddfc1091a9f02aa6e3a54e55ffd2517be512d35e89654f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  #building with as-needed breaks rdp
-  #https://bugzilla.gnome.org/show_bug.cgi?id=653558
-  export LDFLAGS="$LDFLAGS,--no-as-needed"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/vinagre/vinagre.install b/extra/vinagre/vinagre.install
index 68158ac80..4998e6e8b 100644
--- a/extra/vinagre/vinagre.install
+++ b/extra/vinagre/vinagre.install
@@ -1,16 +1,10 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
   update-mime-database usr/share/mime > /dev/null
 }
 
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91-2) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vinagre
-  fi
-}
-
 post_upgrade() {
   post_install
 }
-- 
cgit v1.2.3-54-g00ecf