Hello community,
here is the log from the commit of package tigervnc for openSUSE:Factory
checked in at 2015-12-20 10:52:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tigervnc (Old)
and /work/SRC/openSUSE:Factory/.tigervnc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2015-11-17
14:20:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2015-12-20
10:52:32.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Dec 16 14:25:35 UTC 2015 - m...@suse.com
+
+- u_tigervnc_update_default_vncxstartup.patch
+ * Update default VNC xstartup script.
+- Add dependency on xinit and icewm. (bnc#956537)
+
+-------------------------------------------------------------------
New:
----
u_tigervnc_update_default_vncxstartup.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tigervnc.spec ++++++
--- /var/tmp/diff_new_pack.MeD2qK/_old 2015-12-20 10:52:33.000000000 +0100
+++ /var/tmp/diff_new_pack.MeD2qK/_new 2015-12-20 10:52:33.000000000 +0100
@@ -121,6 +121,7 @@
Patch12: U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
Patch13: u_tigervnc-vncserver-clean-pid-files.patch
Patch14: u_xserver118.patch
+Patch15: u_tigervnc_update_default_vncxstartup.patch
%description
TigerVNC is a high-performance, platform-neutral implementation of VNC
(Virtual Network Computing),
@@ -135,10 +136,12 @@
Requires(post): /usr/sbin/useradd
Requires(post): /usr/sbin/groupadd
# Needed to serve java applet
+Requires: icewm
Requires: python
Requires: python-pyOpenSSL
Requires: xauth
Requires: xinetd
+Requires: xinit
Requires: xkbcomp
Requires: xkeyboard-config
Summary: TigerVNC implementation of Xvnc
@@ -165,6 +168,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
pushd unix/xserver
patch -p1 < ../xserver117.patch
++++++ u_tigervnc_update_default_vncxstartup.patch ++++++
Author: Michal Srb <m...@suse.com>
References: bnc#956537
Subject: Update default vnc xstartup script.
Index: tigervnc-1.5.0/unix/vncserver
===================================================================
--- tigervnc-1.5.0.orig/unix/vncserver
+++ tigervnc-1.5.0/unix/vncserver
@@ -59,27 +59,31 @@ $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".
+ "\n".
+ "userclientrc=\$HOME/.xinitrc\n".
+ "sysclientrc=/etc/X11/xinit/xinitrc\n".
+ "\n".
+ "if [ -f \"\$userclientrc\" ]; then\n".
+ " client=\"\$userclientrc\"\n".
+ "elif [ -f \"\$sysclientrc\" ]; then\n".
+ " client=\"\$sysclientrc\"\n".
"fi\n".
- "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
- " exec /etc/X11/xinit/xinitrc\n".
+ "\n".
+ "if [ -x \"\$client\" ]; then\n".
+ " exec \"\$client\"\n".
"fi\n".
- "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
- " exec sh /etc/X11/xinit/xinitrc\n".
+ "if [ -f \"\$client\" ]; then\n".
+ " exec sh \"\$client\"\n".
"fi\n".
+ "\n".
"[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
"xsetroot -solid grey\n".
"xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
- "twm &\n");
+ "if [ -x /usr/bin/twm ]; then\n".
+ " /usr/bin/twm &\n".
+ "else\n".
+ " echo \"No window manager found. You should install a window manager
to get properly working VNC session.\"\n".
+ "fi\n");
chop($host = `uname -n`);
