rpms/vino/F-11 restart-loop.patch,NONE,1.1 vino.spec,1.94,1.95

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/vino/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26667

Modified Files:
	vino.spec 
Added Files:
	restart-loop.patch 
Log Message:
Avoid restarting vino-server in a loop


restart-loop.patch:

--- NEW FILE restart-loop.patch ---
diff -up vino-2.26.1/server/vino-server.desktop.in.in.restart-loop vino-2.26.1/server/vino-server.desktop.in.in
--- vino-2.26.1/server/vino-server.desktop.in.in.restart-loop	2009-04-17 17:50:25.877439480 -0400
+++ vino-2.26.1/server/vino-server.desktop.in.in	2008-12-16 11:59:28.000000000 -0500
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Remote Desktop
 _Comment=GNOME Remote Desktop Server
-Exec=@LIBEXECDIR@/vino-server --sm-disable
+Exec=@LIBEXECDIR@/vino-server
 Icon=preferences-desktop-remote-desktop
 OnlyShowIn=GNOME;
 Terminal=false
diff -up vino-2.26.1/server/vino-server.desktop.in.restart-loop vino-2.26.1/server/vino-server.desktop.in
--- vino-2.26.1/server/vino-server.desktop.in.restart-loop	2009-04-17 17:50:37.206439463 -0400
+++ vino-2.26.1/server/vino-server.desktop.in	2009-04-17 17:21:40.428452751 -0400
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Remote Desktop
 _Comment=GNOME Remote Desktop Server
-Exec=/usr/libexec/vino-server --sm-disable
+Exec=/usr/libexec/vino-server
 Icon=preferences-desktop-remote-desktop
 OnlyShowIn=GNOME;
 Terminal=false


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/F-11/vino.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vino.spec	13 Apr 2009 17:21:11 -0000	1.94
+++ vino.spec	17 Apr 2009 21:56:51 -0000	1.95
@@ -9,13 +9,16 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.26/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579355
+Patch0: restart-loop.patch
+
 Requires(pre): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
@@ -41,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .restart-loop
 
 %build
 %configure                   	\
@@ -108,6 +112,9 @@
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Fri Apr 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Avoid restarting vino-server in a loop
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/vino/2.26/vino-2.26.1.news