rpms/tigervnc/devel tigervnc11-options.patch, NONE, 1.1 tigervnc.spec, 1.40, 1.41

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21724

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc11-options.patch 
Log Message:
- vncserver: accept <+optname> option when specified as the first one


tigervnc11-options.patch:
 vncserver |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tigervnc11-options.patch ---
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();


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- tigervnc.spec	24 Jun 2010 10:32:11 -0000	1.40
+++ tigervnc.spec	28 Jun 2010 13:53:18 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name:		tigervnc
 Version:	1.0.90
-Release:	0.14.%{snap}%{?dist}
+Release:	0.15.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -45,6 +45,7 @@ Patch10:	tigervnc11-ldnow.patch
 Patch11:	tigervnc11-libvnc.patch
 Patch12:	tigervnc11-rh597172.patch
 Patch13:	tigervnc11-rh600070.patch
+Patch14:	tigervnc11-options.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -112,6 +113,7 @@ clients to use web browser when connect 
 %patch11 -p1 -b .libvnc
 %patch12 -p1 -b .rh597172
 %patch13 -p1 -b .rh600070
+%patch14 -p1 -b .options
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
@@ -275,6 +277,9 @@ fi
 %{_datadir}/vnc/classes/*
 
 %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
 - fix memory leak in Xvnc input code (#597172)
 - don't crash when receive negative encoding (#600070)