rpms/tigervnc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- vncserver: accept <+optname> option when specified as the first one

Browse Source
This commit is contained in:
Adam Tkac 2010-06-28 13:53:19 +00:00
parent cb40327fd7
commit dc728211d6
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tigervnc.spec
View File

@ -2,7 +2,7 @@
Name: tigervnc Name: tigervnc
Version: 1.0.90 Version: 1.0.90
Release: 0.14.%{snap}%{?dist} Release: 0.15.%{snap}%{?dist}
Summary: A TigerVNC remote display system Summary: A TigerVNC remote display system
Group: User Interface/Desktops Group: User Interface/Desktops
@ -45,6 +45,7 @@ Patch10: tigervnc11-ldnow.patch
Patch11: tigervnc11-libvnc.patch Patch11: tigervnc11-libvnc.patch
Patch12: tigervnc11-rh597172.patch Patch12: tigervnc11-rh597172.patch
Patch13: tigervnc11-rh600070.patch Patch13: tigervnc11-rh600070.patch
Patch14: tigervnc11-options.patch
%description %description
Virtual Network Computing (VNC) is a remote display system which Virtual Network Computing (VNC) is a remote display system which
@ -112,6 +113,7 @@ clients to use web browser when connect to the TigerVNC server.
%patch11 -p1 -b .libvnc %patch11 -p1 -b .libvnc
%patch12 -p1 -b .rh597172 %patch12 -p1 -b .rh597172
%patch13 -p1 -b .rh600070 %patch13 -p1 -b .rh600070
%patch14 -p1 -b .options
cp -r /usr/share/xorg-x11-server-source/* unix/xserver cp -r /usr/share/xorg-x11-server-source/* unix/xserver
pushd unix/xserver pushd unix/xserver
@ -275,6 +277,9 @@ fi
%{_datadir}/vnc/classes/* %{_datadir}/vnc/classes/*
%changelog %changelog
* Mon Jun 28 2010 Adam Tkac <atkac redhat com> 1.0.90-0.15.20100420svn4030
- vncserver: accept <+optname> option when specified as the first one
* Thu Jun 24 2010 Adam Tkac <atkac redhat com> 1.0.90-0.14.20100420svn4030 * Thu Jun 24 2010 Adam Tkac <atkac redhat com> 1.0.90-0.14.20100420svn4030
- fix memory leak in Xvnc input code (#597172) - fix memory leak in Xvnc input code (#597172)
- don't crash when receive negative encoding (#600070) - don't crash when receive negative encoding (#600070)

12
tigervnc11-options.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up tigervnc-1.0.90-20100420svn4030/unix/vncserver.options tigervnc-1.0.90-20100420svn4030/unix/vncserver
--- tigervnc-1.0.90-20100420svn4030/unix/vncserver.options 2010-06-28 15:38:22.362275199 +0200
+++ tigervnc-1.0.90-20100420svn4030/unix/vncserver 2010-06-28 15:40:05.277332830 +0200
@@ -176,7 +176,7 @@ if ((@ARGV > 0) && ($ARGV[0] =~ /^:(\d+)
if (!&CheckDisplayNumber($displayNumber)) {
die "A VNC server is already running as :$displayNumber\n";
}
-} elsif ((@ARGV > 0) && ($ARGV[0] !~ /^-/)) {
+} elsif ((@ARGV > 0) && ($ARGV[0] !~ /^-/) && ($ARGV[0] !~ /^\+/)) {
&Usage();
} else {
$displayNumber = &GetDisplayNumber();