pool/tigervnc
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 590612 from home:michalsrb:branches:bnc1085974:X11:XOrg

Browse Source 
- Enable xvnc.socket if upgraded from previous installation that
  had VNC enabled in xinetd configuration. (bnc#1085974)
- Subpackage xorg-x11-Xvnc must also obsolete tightvnc.

OBS-URL: https://build.opensuse.org/request/show/590612
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=133
This commit is contained in:
Michal Srb 2018-03-23 10:14:23 +00:00 committed by Git OBS Bridge
parent d59dc416d6
commit 82470fbc3d
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tigervnc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Mar 22 14:27:28 UTC 2018 - msrb@suse.com
- Enable xvnc.socket if upgraded from previous installation that
had VNC enabled in xinetd configuration. (bnc#1085974)
- Subpackage xorg-x11-Xvnc must also obsolete tightvnc.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 28 12:19:52 UTC 2018 - msrb@suse.com Wed Feb 28 12:19:52 UTC 2018 - msrb@suse.com

18
tigervnc.spec
View File

@ -151,6 +151,8 @@ TigerVNC also provides extensions for advanced authentication methods and TLS en
%package -n xorg-x11-Xvnc %package -n xorg-x11-Xvnc
Requires(post): /usr/sbin/useradd Requires(post): /usr/sbin/useradd
Requires(post): /usr/sbin/groupadd Requires(post): /usr/sbin/groupadd
Requires(post): /bin/awk
Requires(post): systemd
# Needed to generate certificates # Needed to generate certificates
Requires: openssl Requires: openssl
Requires: windowmanager Requires: windowmanager
@ -162,7 +164,9 @@ Requires: xorg-x11-fonts-core
# For the with-vnc-key.sh script # For the with-vnc-key.sh script
Requires: /bin/hostname Requires: /bin/hostname
%{?systemd_requires} %{?systemd_requires}
Provides: tightvnc = 1.3.9
Provides: xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh Provides: xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh
Obsoletes: tightvnc < 1.3.9
Summary: TigerVNC implementation of Xvnc Summary: TigerVNC implementation of Xvnc
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -360,6 +364,20 @@ usermod -G shadow -a %{vncuser} || :
%post -n xorg-x11-Xvnc %post -n xorg-x11-Xvnc
%service_add_post xvnc.socket %service_add_post xvnc.socket
# If there is old xinetd configuration file and VNC service was enabled, enable the systemd service too.
# Once we are done, RPM will rename the file to /etc/xinetd.d/vnc.rpmsave, so this won't happen
# during future updates.
if [ -e /etc/xinetd.d/vnc ] && awk '
BEGIN { in_vnc1_section = 0 }
/service.*vnc1/ { in_vnc1_section = 1 }
in_vnc1_section && /disable\s*=\s*yes/ { exit 1 }
in_vnc1_section && /}/ { exit 0 }
' /etc/xinetd.d/vnc;
then
echo "Found old xinetd configuration with enabled VNC service. Enabling xvnc.socket."
systemctl enable xvnc.socket
fi
%preun -n xorg-x11-Xvnc %preun -n xorg-x11-Xvnc
%service_del_preun xvnc.socket %service_del_preun xvnc.socket