[xfce4-session] Add patch to handle running startxfce4 from console. Fixes bug #1117682

[Kevin Fenzi]

commit 37091a9f8308e38c9c86673477dedc87f2a647de
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Jul 11 19:11:23 2014 -0600

    Add patch to handle running startxfce4 from console. Fixes bug #1117682
    
    - Thanks poma for patch.

 xfce-session-4.10-startxfce4.patch |   21 +++++++++++++++++++++
 xfce4-session.spec                 |   10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/xfce-session-4.10-startxfce4.patch b/xfce-session-4.10-startxfce4.patch
new file mode 100644
index 0000000..2216a0e
--- /dev/null
+++ b/xfce-session-4.10-startxfce4.patch
@@ -0,0 +1,21 @@
+--- a/scripts/startxfce4.in	
++++ a/scripts/startxfce4.in	
+@@ -108,13 +108,15 @@ then
+   SERVERRC="-- $SERVERRC"
+ fi
+ 
++tty_num=$(echo $(tty | grep -o '[0-9]'))
++
+ if [ -f $BASEDIR/xinitrc ]; then
+-  exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC
++  exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC -- vt${tty_num}
+ elif [ -f $HOME/.xfce4/xinitrc ]; then
+   mkdir -p $BASEDIR
+   cp $HOME/.xfce4/xinitrc $BASEDIR/
+-  exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC
++  exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC -- vt${tty_num}
+ else
+-  exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC
++  exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC -- vt${tty_num}
+ fi
+ 
diff --git a/xfce4-session.spec b/xfce4-session.spec
index abc1acc..7269f6f 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -2,7 +2,7 @@
 
 Name:           xfce4-session
 Version:        4.10.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Xfce session manager
 
 Group:          User Interface/Desktops
@@ -15,6 +15,9 @@ Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-
 Source1:        polkit-gnome-authentication-agent-1.desktop
 # Patch from: https://bugzilla.xfce.org/show_bug.cgi?id=9952#c7
 Patch1:         xfce4-session-4.10.1-systemd.patch
+# Patch startxfce4 to keep it on the same vty for logind
+# https://bugzilla.redhat.com/show_bug.cgi?id=1117682
+Patch2:         xfce-session-4.10-startxfce4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,6 +78,7 @@ Additional splash screen engines for the Xfce Session Manager.
 %setup -q
 
 %patch1 -p1
+%patch2 -p1
 
 %build
 xdt-autogen
@@ -157,6 +161,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/themes/Default/balou/
 
 %changelog
+* Fri Jul 11 2014 Kevin Fenzi <kevin at scrye.com> 4.10.1-5
+- Add patch to handle running startxfce4 from console. Fixes bug #1117682
+- Thanks poma for patch.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild