rpm/tigervnc
SHA256
1
0
Fork 0
forked from pool/tigervnc
Code Pull Requests Activity

Accepting request 888839 from home:sbradnick:branches:X11:XOrg

Browse Source 
- 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
This commit is contained in:
Stefan Dirsch 2021-05-02 20:41:14 +00:00 committed by Git OBS Bridge
parent d395eb038c
commit 9e5f310b0f
4 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tigervnc.changes
View File

@ -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> Fri Mar 5 14:46:02 UTC 2021 - Pedro Monreal <pmonreal@suse.com>

13
tigervnc.spec
View File

@ -108,8 +108,8 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.14
BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xproto) >= 7.0.17
BuildRequires: pkgconfig(xtrans) >= 1.2.2 BuildRequires: pkgconfig(xtrans) >= 1.2.2
%if 0%{?suse_version} >= 1315 %if 0%{?suse_version} >= 1315
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun): update-alternatives Requires(postun):update-alternatives
%endif %endif
URL: http://tigervnc.org/ URL: http://tigervnc.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -128,7 +128,14 @@ Source11: index.vnc
Source12: x11vnc Source12: x11vnc
Source13: xvnc@.service Source13: xvnc@.service
Source14: xvnc.socket 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 Source16: xvnc-novnc.socket
Source17: tigervnc.firewalld Source17: tigervnc.firewalld
Source18: tigervnc-https.firewalld Source18: tigervnc-https.firewalld

0
xvnc-novnc.service → xvnc-novnc-lib.service
View File

10
xvnc-novnc-libexec.service Normal file
View File

@ -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