From 0678acdf67edbeec2cb5e572547d7c9ccab4b483 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Tue, 21 Sep 2010 10:30:27 +0200
Subject: [PATCH] Improve patch for #633645 (fix tcsh incompatibilities).

Conflicts:

	tigervnc.spec

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 tigervnc.spec  | 5 ++++-
 vncserver.init | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tigervnc.spec b/tigervnc.spec
index 1ff6733..03568cf 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -2,7 +2,7 @@
 
 Name:		tigervnc
 Version:	1.0.90
-Release:	0.20.%{snap}%{?dist}
+Release:	0.21.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -305,6 +305,9 @@ fi
 %doc LICENCE.TXT
 
 %changelog
+* Tue Sep 21 2010 Adam Tkac <atkac redhat com> 1.0.90-0.21.20100420svn4030
+- improve patch for #633645 (fix tcsh incompatibilities)
+
 * Thu Sep 16 2010 Adam Tkac <atkac redhat com> 1.0.90-0.20.20100813svn4123
 - press fake modifiers correctly (#633931)
 - supress unneeded debug information emitted from initscript (#633645)
diff --git a/vncserver.init b/vncserver.init
index 5ca760b..4e420bd 100644
--- a/vncserver.init
+++ b/vncserver.init
@@ -51,7 +51,7 @@ start() {
 	USER="${display##*:}"
 	VNCUSERARGS="${VNCSERVERARGS[${DISP}]}"
         runuser -l ${USER} -c "cd ~${USER} && [ -r .vnc/passwd ] && \
-			       vncserver :${DISP} ${VNCUSERARGS} > /dev/null 2>&1 "
+			       vncserver :${DISP} ${VNCUSERARGS}" > /dev/null 2>&1
         RETVAL=$?
         [ "$RETVAL" -eq 0 ] || break
     done