From 7e74073979337f51e8189d51f3aa572a650f96f8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jun 30 2010 05:31:45 +0000
Subject: 2.31.4


---

diff --git a/.cvsignore b/.cvsignore
index a2f11a8..59ad90d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vino-2.28.2.tar.bz2
+vino-2.31.4.tar.bz2
diff --git a/sources b/sources
index 5fb4102..af0b3d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b7fcd23925efb628da2d2f12d73b485  vino-2.28.2.tar.bz2
+706e0be7fe5926694ba36047678c5a55  vino-2.31.4.tar.bz2
diff --git a/vino.spec b/vino.spec
index 9f55132..848a711 100644
--- a/vino.spec
+++ b/vino.spec
@@ -9,15 +9,11 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.28.2
+Version: 2.31.4
 Release: 1%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/vino
-Source0: http://download.gnome.org/sources/vino/2.28/%{name}-%{version}.tar.bz2
-
-Patch0: vino-smclient.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=596548
-Patch1: restart-command.patch
+Source0: http://download.gnome.org/sources/vino/2.31/%{name}-%{version}.tar.bz2
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -53,9 +49,6 @@ connect to a running GNOME session using VNC.
 
 %prep
 %setup -q
-%patch0 -p1 -b .smclient
-
-autoreconf -i -f
 
 %build
 %configure                   	\
@@ -74,8 +67,6 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dyn
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -90,9 +81,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas >& /dev/null || :
@@ -131,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Wed Jun 30 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.4-1
+- Update to 2.31.4
+
 * Tue Mar 30 2010 Matthias Clasen <mclasen@redhat.com> - 2.28.2-1
 - Update to 2.28.2