From 5869b8d95a6ba865b5fd024d2f3e2c3213390bba Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Sep 19 2013 15:15:06 +0000
Subject: Merge branch 'f19' into f20


---

diff --git a/10-libvnc.conf b/10-libvnc.conf
index a053a7d..259d718 100644
--- a/10-libvnc.conf
+++ b/10-libvnc.conf
@@ -12,7 +12,7 @@
 #EndSection
 
 #Section "Screen"
-#    Identifier "Screen0
+#    Identifier "Screen0"
 #    DefaultDepth 16
 #    Option "SecurityTypes" "VncAuth"
 #    Option "PasswordFile" "/root/.vnc/passwd"
diff --git a/tigervnc.spec b/tigervnc.spec
index 5d9b439..8986c43 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.3.0
-Release:	4%{?dist}
+Release:	6%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -340,6 +340,12 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %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
 - Fixed doc-related build failure (bug #992790).
 
diff --git a/vncserver.service b/vncserver.service
index 3976e02..4d55de2 100644
--- a/vncserver.service
+++ b/vncserver.service
@@ -34,10 +34,12 @@ Description=Remote desktop service (VNC)
 After=syslog.target network.target
 
 [Service]
-Type=simple
+Type=forking
 # Clean any existing files in /tmp/.X11-unix environment
 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]
 WantedBy=multi-user.target