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

- Use a template xvnc@.service.in to dynamically adjust xvnc@.service

Browse Source 
during installation to cater for the correct libexecdir value. This
  fixes wrong path for with-vnc-key.sh on sle15-sp4 (bsc#1192713)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=219
This commit is contained in:
Stefan Dirsch 2021-11-15 17:40:56 +00:00 committed by Git OBS Bridge
parent 8201077051
commit 54dd3affe5
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tigervnc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 15 17:22:13 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- Use a template xvnc@.service.in to dynamically adjust xvnc@.service
during installation to cater for the correct libexecdir value. This
fixes wrong path for with-vnc-key.sh on sle15-sp4 (bsc#1192713)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 29 16:57:10 UTC 2021 - Stefan Dirsch <sndirsch@suse.com> Fri Oct 29 16:57:10 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

5
tigervnc.spec
View File

@ -51,7 +51,7 @@ Source9: vnc.pam
Source10: with-vnc-key.sh Source10: with-vnc-key.sh
Source11: index.vnc Source11: index.vnc
Source12: x11vnc Source12: x11vnc
Source13: xvnc@.service Source13: xvnc@.service.in
Source14: xvnc.socket Source14: xvnc.socket
Source16: xvnc-novnc.socket Source16: xvnc-novnc.socket
Source17: tigervnc.firewalld Source17: tigervnc.firewalld
@ -285,6 +285,7 @@ popd
%sysusers_generate_pre %{SOURCE22} xorg-x11-Xvnc vnc.conf %sysusers_generate_pre %{SOURCE22} xorg-x11-Xvnc vnc.conf
export CXXFLAGS="%optflags" export CXXFLAGS="%optflags"
export CFLAGS="%optflags" export CFLAGS="%optflags"
sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE13} > xvnc@.service
sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} > xvnc-novnc.service sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} > xvnc-novnc.service
# Build all tigervnc # Build all tigervnc
cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo . cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo .
@ -369,7 +370,7 @@ install -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/vnc
install -D -m 755 %{SOURCE12} %{buildroot}%{_bindir}/x11vnc install -D -m 755 %{SOURCE12} %{buildroot}%{_bindir}/x11vnc
install -D %{SOURCE13} -m 0444 %{buildroot}%{_unitdir}/xvnc@.service install -D xvnc@.service -m 0444 %{buildroot}%{_unitdir}/xvnc@.service
install -D %{SOURCE14} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket install -D %{SOURCE14} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket
install -D %{SOURCE16} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket install -D %{SOURCE16} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket
install -D %{SOURCE19} -m 0444 %{buildroot}%{_unitdir}/xvnc.target install -D %{SOURCE19} -m 0444 %{buildroot}%{_unitdir}/xvnc.target

2
xvnc@.service → xvnc@.service.in
View File

@ -2,7 +2,7 @@
Description=Xvnc Server Description=Xvnc Server
[Service] [Service]
ExecStart=/usr/libexec/vnc/with-vnc-key.sh /usr/bin/Xvnc -noreset -inetd -once -query localhost -geometry 1024x768 -securitytypes X509None,None -X509Key /etc/vnc/tls.key -X509Cert /etc/vnc/tls.cert -log *:syslog:30 -extension MIT-SHM ExecStart=@LIBEXECDIR@/vnc/with-vnc-key.sh /usr/bin/Xvnc -noreset -inetd -once -query localhost -geometry 1024x768 -securitytypes X509None,None -X509Key /etc/vnc/tls.key -X509Cert /etc/vnc/tls.cert -log *:syslog:30 -extension MIT-SHM
User=vnc User=vnc
StandardInput=socket StandardInput=socket
StandardOutput=socket StandardOutput=socket