From aa7b6c3135d3444e13ce42391b0916ce6487280a Mon Sep 17 00:00:00 2001
From: eaglegai <eaglegai@163.com>
Date: Tue, 12 Apr 2022 16:22:49 +0800
Subject: [PATCH] fix vncserver unrecognized option rfbwait

(cherry picked from commit a0408857c6a5fdf0fd30cef88abb8111f3231af5)
---
 tigervnc.spec | 8 +++++++-
 vncserver     | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tigervnc.spec b/tigervnc.spec
index 06535f2..4c0c1a5 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -4,7 +4,7 @@
 
 Name:           tigervnc
 Version:        1.12.0
-Release:        4
+Release:        5
 Summary:        A TigerVNC remote display system
 
 License:        GPLv2+
@@ -236,6 +236,12 @@ install -m 644 %{SOURCE6} %{buildroot}%{_docdir}/tigervnc/HOWTO.md
 %{_mandir}/man8/*
 
 %changelog
+* Tue Apr 12 2022 gaihuiying <eaglegai@163.com> - 1.12.0-5
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix vncserver unrecognized option rfbwait
+
 * Tue Apr 12 2022 gaihuiying <eaglegai@163.com> - 1.12.0-4
 - Type:bugfix
 - ID:NA
diff --git a/vncserver b/vncserver
index 5051f52..ffb65f4 100644
--- a/vncserver
+++ b/vncserver
@@ -194,7 +194,6 @@ $default_opts{auth} = &quotedString($xauthorityFile);
 $default_opts{geometry} = $geometry if ($geometry);
 $default_opts{depth} = $depth if ($depth);
 $default_opts{pixelformat} = $pixelformat if ($pixelformat);
-$default_opts{rfbwait} = 30000;
 $default_opts{rfbauth} = "$vncUserDir/passwd";
 $default_opts{rfbport} = $vncPort;
 $default_opts{fp} = $fontPath if ($fontPath);
@@ -894,4 +893,4 @@ sub NotifyAboutDeprecation
 {
     warn "\nWARNING: vncserver has been replaced by a systemd unit and is now considered deprecated and removed in upstream.\n";
     warn "Please read /usr/share/doc/tigervnc/HOWTO.md for more information.\n";
-}
\ No newline at end of file
+}