Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/tigervnc.git#f0066896c03ad232002c31feec3d5a1be81943a1
This commit is contained in:
DistroBaker 2020-12-16 22:34:22 +00:00
parent 9131d32ccf
commit 0b6439e250
2 changed files with 7 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: tigervnc Name: tigervnc
Version: 1.11.0 Version: 1.11.0
Release: 8%{?dist} Release: 9%{?dist}
Summary: A TigerVNC remote display system Summary: A TigerVNC remote display system
%global _hardened_build 1 %global _hardened_build 1
@ -338,6 +338,9 @@ fi
%{_datadir}/selinux/packages/vncsession.pp %{_datadir}/selinux/packages/vncsession.pp
%changelog %changelog
* Thu Dec 10 07:45:46 CET 2020 Jan Grulich <jgrulich@redhat.com> - 1.11.0-9
- vncserver: ignore new session parameter from the new systemd support
* Fri Nov 13 14:08:29 CET 2020 Jan Grulich <jgrulich@redhat.com> - 1.11.0-8 * Fri Nov 13 14:08:29 CET 2020 Jan Grulich <jgrulich@redhat.com> - 1.11.0-8
- Use /run instead of /var/run which is just a symlink - Use /run instead of /var/run which is just a symlink

View File

@ -435,6 +435,9 @@ sub LoadConfig {
next if /^#/; next if /^#/;
if (my ($k, $v) = /^\s*(\w+)\s*=\s*(.+)$/) { if (my ($k, $v) = /^\s*(\w+)\s*=\s*(.+)$/) {
$k = lc($k); # must normalize key case $k = lc($k); # must normalize key case
if ($k eq "session") {
next;
}
if ($warnoverride && $config{$k}) { if ($warnoverride && $config{$k}) {
print("Warning: $configFile is overriding previously defined '$k' to be '$v'\n"); print("Warning: $configFile is overriding previously defined '$k' to be '$v'\n");
} }