From 9e5f310b0fa1550e5381e21ddd3ae78a8df6a479a414cf239f835ebffac0f845 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sun, 2 May 2021 20:41:14 +0000
Subject: [PATCH] Accepting request 888839 from
 home:sbradnick:branches:X11:XOrg

- Adjusting suse_version check from '> 1500' to '>= 1550' per request.

- Adding if statement to control libexec (Tumbleweed +) vs lib based
  'Source#' file for 'xvnc-novnc.service'.

- 'xvnc-novnc.service' requires '/usr/libexec/vnc/with-vnc-key.sh'
  vs '/usr/lib/vnc/with-vnc-key.sh' for ExecStart to work correctly.

OBS-URL: https://build.opensuse.org/request/show/888839
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=203
---
 tigervnc.changes                             | 17 +++++++++++++++++
 tigervnc.spec                                | 13 ++++++++++---
 xvnc-novnc.service => xvnc-novnc-lib.service |  0
 xvnc-novnc-libexec.service                   | 10 ++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)
 rename xvnc-novnc.service => xvnc-novnc-lib.service (100%)
 create mode 100644 xvnc-novnc-libexec.service

diff --git a/tigervnc.changes b/tigervnc.changes
index afdd367..0ed65fa 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Apr 27 13:41:26 UTC 2021 - Scott Bradnick <scott.bradnick@suse.com>
+
+- Adjusting suse_version check from '> 1500' to '>= 1550' per request.
+
+-------------------------------------------------------------------
+Fri Apr 23 14:26:45 UTC 2021 - Scott Bradnick <scott.bradnick@suse.com>
+
+- Adding if statement to control libexec (Tumbleweed +) vs lib based
+  'Source#' file for 'xvnc-novnc.service'.
+
+-------------------------------------------------------------------
+Thu Apr 22 18:30:29 UTC 2021 - Scott Bradnick <scott.bradnick@suse.com>
+
+- 'xvnc-novnc.service' requires '/usr/libexec/vnc/with-vnc-key.sh'
+  vs '/usr/lib/vnc/with-vnc-key.sh' for ExecStart to work correctly.
+
 -------------------------------------------------------------------
 Fri Mar  5 14:46:02 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 37abffd..349bee6 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -108,8 +108,8 @@ BuildRequires:  pkgconfig(xorg-macros) >= 1.14
 BuildRequires:  pkgconfig(xproto)  >= 7.0.17
 BuildRequires:  pkgconfig(xtrans) >= 1.2.2
 %if 0%{?suse_version} >= 1315
-Requires(post):   update-alternatives
-Requires(postun): update-alternatives
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
 %endif
 URL:            http://tigervnc.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -128,7 +128,14 @@ Source11:       index.vnc
 Source12:       x11vnc
 Source13:       xvnc@.service
 Source14:       xvnc.socket
-Source15:       xvnc-novnc.service
+# Tumbleweed uses /usr/libexec/
+# Leap uses /usr/lib/
+# %if 0%{?suse_version} > 1500
+%if 0%{?suse_version} >= 1550
+Source15:       xvnc-novnc-libexec.service
+%else
+Source15:       xvnc-novnc-lib.service
+%endif
 Source16:       xvnc-novnc.socket
 Source17:       tigervnc.firewalld
 Source18:       tigervnc-https.firewalld
diff --git a/xvnc-novnc.service b/xvnc-novnc-lib.service
similarity index 100%
rename from xvnc-novnc.service
rename to xvnc-novnc-lib.service
diff --git a/xvnc-novnc-libexec.service b/xvnc-novnc-libexec.service
new file mode 100644
index 0000000..1d56adc
--- /dev/null
+++ b/xvnc-novnc-libexec.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=noVNC Web Server
+Requires=xvnc.target
+After=xvnc.target
+
+[Service]
+ExecStart=/usr/libexec/vnc/with-vnc-key.sh /usr/bin/websockify --key /etc/vnc/tls.key --cert /etc/vnc/tls.cert --web /usr/share/novnc --inetd localhost:5901
+User=vnc
+StandardInput=socket
+StandardError=syslog