[x2goserver] Update 4.0.1.13

[Orion Poplawski]

commit 4ced747b6137f9f49858c73e6f1e7a1d51c1b055
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Jan 26 20:31:23 2014 -0700

    Update 4.0.1.13
    
    - Add xsession sub-package

 .gitignore      |    1 +
 sources         |    2 +-
 x2goserver.spec |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 47 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d691e7..f7fdef5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /x2goserver-4.0.1.10.tar.gz
 /x2goserver-4.0.1.11.tar.gz
 /x2goserver-4.0.1.12.tar.gz
+/x2goserver-4.0.1.13.tar.gz
diff --git a/sources b/sources
index 6e4ab3d..5f9c58f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f41accfb7b7d8b8113eb6f2f686e340  x2goserver-4.0.1.12.tar.gz
+24181098a9c4d7a5ca2c1416b0cee22d  x2goserver-4.0.1.13.tar.gz
diff --git a/x2goserver.spec b/x2goserver.spec
index e919b92..50d4c22 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -1,6 +1,6 @@
 #global checkout 20130722git65169c9
 Name:           x2goserver
-Version:        4.0.1.12
+Version:        4.0.1.13
 Release:        1%{?dist}
 Summary:        X2Go Server
 
@@ -43,8 +43,6 @@ Requires:       sshfs
 # For /etc/sudoers.d
 Requires:       sudo
 Requires:       x2goagent
-# For /etc/X11/Xresources
-Requires:       xorg-x11-xinit
 Requires:       xorg-x11-fonts-misc
 Requires(pre):  shadow-utils
 
@@ -112,6 +110,31 @@ this package on the X2Go server(s) (and the cups-x2go package on the CUPS
 server).
 
 
+%package xsession
+Summary:        X2Go Server Xsession runner
+Requires:       %{name} = %{version}-%{release}
+# Symlinks to xinit files
+Requires:       xorg-x11-xinit
+Group:          Applications/Communications
+
+%description xsession
+X2Go is a server based computing environment with
+   - session resuming
+   - low bandwidth support
+   - session brokerage support
+   - client side mass storage mounting support
+   - audio support
+   - authentication by smartcard and USB stick
+
+This X2Go server add-on enables Xsession script handling
+when starting desktop sessions with X2Go.
+
+Amongst others the parsing of Xsession scripts will
+enable desktop-profiles, ssh-agent startups, gpgagent
+startups and many more Xsession related features on
+X2Go session login automagically.
+
+
 %prep
 %setup -q
 
@@ -122,8 +145,6 @@ sed -i -e 's/\t$(MAKE) -C x2goserver-compat/#\t$(MAKE) -C x2goserver-compat/g' M
 sed -i -e 's/\t$(MAKE) -C x2goserver-pyhoca/#\t$(MAKE) -C x2goserver-pyhoca/g' Makefile
 # Don't try to be root
 sed -i -e 's/-o root -g root//' */Makefile
-# Do not ship xsession - Debian specific
-sed -i -e '/xsession/s/^/#/' Makefile
 
 
 %build
@@ -132,7 +153,7 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%
 
 
 %install
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
 
 # Make symbolic link relative (xsession - disabled for now)
 #rm %{buildroot}%{_sysconfdir}/x2go/Xresources
@@ -220,7 +241,11 @@ exit 0
 %doc debian/changelog debian/copyright
 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver
 %dir %{_sysconfdir}/x2go/
-%config(noreplace) %{_sysconfdir}/x2go/x*
+%config(noreplace) %{_sysconfdir}/x2go/x2go_logout
+%config(noreplace) %{_sysconfdir}/x2go/x2go_logout.d/
+%config(noreplace) %{_sysconfdir}/x2go/x2goagent.options
+%config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf
+%config(noreplace) %{_sysconfdir}/x2go/x2gosql/
 %{_bindir}/x2go*
 %exclude %{_bindir}/x2gofm
 %exclude %{_bindir}/x2goprint
@@ -275,7 +300,20 @@ exit 0
 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint
 %{_mandir}/man8/x2goprint.8.gz
 
+%files xsession
+%{_sysconfdir}/x2go/xinitrc.d
+%{_sysconfdir}/x2go/Xclients.d
+%{_sysconfdir}/x2go/Xresources
+%config(noreplace) %{_sysconfdir}/x2go/Xsession
+%{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features
+%{_datadir}/x2go/versions/VERSION.x2goserver-xsession
+
+
 %changelog
+* Sun Jan 26 2014 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.13-1
+- Update 4.0.1.13
+- Add xsession sub-package
+
 * Tue Jan 7 2014 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.12-1
 - Update 4.0.1.12