From 0b6439e250bb1a172f6fe15a39e961eaf150e614 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 16 Dec 2020 22:34:22 +0000
Subject: [PATCH] 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
---
 tigervnc.spec | 5 ++++-
 vncserver     | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tigervnc.spec b/tigervnc.spec
index ad9918d..a5dc5f7 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:           tigervnc
 Version:        1.11.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A TigerVNC remote display system
 
 %global _hardened_build 1
@@ -338,6 +338,9 @@ fi
 %{_datadir}/selinux/packages/vncsession.pp
 
 %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
 - Use /run instead of /var/run which is just a symlink
 
diff --git a/vncserver b/vncserver
index 2e2d519..787c9a8 100644
--- a/vncserver
+++ b/vncserver
@@ -435,6 +435,9 @@ sub LoadConfig {
         next if /^#/;
         if (my ($k, $v) = /^\s*(\w+)\s*=\s*(.+)$/) {
           $k = lc($k); # must normalize key case
+          if ($k eq "session") {
+            next;
+          }
           if ($warnoverride && $config{$k}) {
             print("Warning: $configFile is overriding previously defined '$k' to be '$v'\n");
           }