[tigervnc/f19] Clearer xstartup file (bug #923655).
Tim Waugh
twaugh at fedoraproject.org
Mon Feb 10 17:33:49 UTC 2014
commit bb32676e600b76764f927bdee2504645ae26de62
Author: Tim Waugh <twaugh at redhat.com>
Date: Mon Feb 10 15:00:28 2014 +0000
Clearer xstartup file (bug #923655).
Resolves: rhbz#923655
(cherry picked from commit 372fc5f067eeaf137de99aef95a1b801416f3086)
Conflicts:
tigervnc.spec
tigervnc-xstartup.patch | 32 ++++++++++++++++++++++++++++++++
tigervnc.spec | 5 ++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/tigervnc-xstartup.patch b/tigervnc-xstartup.patch
new file mode 100644
index 0000000..696d92b
--- /dev/null
+++ b/tigervnc-xstartup.patch
@@ -0,0 +1,32 @@
+diff -up tigervnc-1.3.0/unix/vncserver.xstartup tigervnc-1.3.0/unix/vncserver
+--- tigervnc-1.3.0/unix/vncserver.xstartup 2014-02-10 14:52:39.902673875 +0000
++++ tigervnc-1.3.0/unix/vncserver 2014-02-10 14:53:30.398847723 +0000
+@@ -59,27 +59,7 @@ $defaultXStartup
+ = ("#!/bin/sh\n\n".
+ "unset SESSION_MANAGER\n".
+ "unset DBUS_SESSION_BUS_ADDRESS\n".
+- "OS=`uname -s`\n".
+- "if [ \$OS = 'Linux' ]; then\n".
+- " case \"\$WINDOWMANAGER\" in\n".
+- " \*gnome\*)\n".
+- " if [ -e /etc/SuSE-release ]; then\n".
+- " PATH=\$PATH:/opt/gnome/bin\n".
+- " export PATH\n".
+- " fi\n".
+- " ;;\n".
+- " esac\n".
+- "fi\n".
+- "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
+- " exec /etc/X11/xinit/xinitrc\n".
+- "fi\n".
+- "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
+- " exec sh /etc/X11/xinit/xinitrc\n".
+- "fi\n".
+- "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
+- "xsetroot -solid grey\n".
+- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
+- "twm &\n");
++ "exec /etc/X11/xinit/xinitrc\n");
+
+ chop($host = `uname -n`);
+
diff --git a/tigervnc.spec b/tigervnc.spec
index 21246df..44d3661 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
Name: tigervnc
Version: 1.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A TigerVNC remote display system
Group: User Interface/Desktops
@@ -344,6 +344,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Mon Feb 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-9
+- Clearer xstartup file (bug #923655).
+
* Tue Jan 21 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-8
- Fixed instructions in systemd unit file.
- Fixed viewer crash when cursor has not been set (bug #1038701).
More information about the scm-commits
mailing list