Merge branch 'f19' into f20
This commit is contained in:
commit
5869b8d95a
@ -12,7 +12,7 @@
|
|||||||
#EndSection
|
#EndSection
|
||||||
|
|
||||||
#Section "Screen"
|
#Section "Screen"
|
||||||
# Identifier "Screen0
|
# Identifier "Screen0"
|
||||||
# DefaultDepth 16
|
# DefaultDepth 16
|
||||||
# Option "SecurityTypes" "VncAuth"
|
# Option "SecurityTypes" "VncAuth"
|
||||||
# Option "PasswordFile" "/root/.vnc/passwd"
|
# Option "PasswordFile" "/root/.vnc/passwd"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: tigervnc
|
Name: tigervnc
|
||||||
Version: 1.3.0
|
Version: 1.3.0
|
||||||
Release: 4%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: A TigerVNC remote display system
|
Summary: A TigerVNC remote display system
|
||||||
|
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
@ -340,6 +340,12 @@ fi
|
|||||||
%{_datadir}/icons/hicolor/*/apps/*
|
%{_datadir}/icons/hicolor/*/apps/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 19 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-6
|
||||||
|
- Fixed typo in 10-libvnc.conf (bug #1009111).
|
||||||
|
|
||||||
|
* Wed Sep 18 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-5
|
||||||
|
- Better fix for PIDFile problem (bug #983232).
|
||||||
|
|
||||||
* Mon Aug 5 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-4
|
* Mon Aug 5 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-4
|
||||||
- Fixed doc-related build failure (bug #992790).
|
- Fixed doc-related build failure (bug #992790).
|
||||||
|
|
||||||
|
@ -34,10 +34,12 @@ Description=Remote desktop service (VNC)
|
|||||||
After=syslog.target network.target
|
After=syslog.target network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=forking
|
||||||
# Clean any existing files in /tmp/.X11-unix environment
|
# Clean any existing files in /tmp/.X11-unix environment
|
||||||
ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
|
ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
|
||||||
ExecStart=/sbin/runuser -l <USER> -c "/usr/bin/vncserver -fg %i"
|
ExecStart=/sbin/runuser -l <USER> -c "/usr/bin/vncserver %i"
|
||||||
|
PIDFile=/home/<USER>/.vnc/%H%i.pid
|
||||||
|
ExecStop=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
Loading…
Reference in New Issue
Block a user