commit b595adf211e9dba98ad383452b5009c87fb65c0f
Author: Orion Poplawski <orion(a)nwra.com>
Date: Tue Dec 31 10:43:00 2013 -0700
Sync some items to upstream spec
x2goserver.spec | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/x2goserver.spec b/x2goserver.spec
index 7b5e3fa..49e3552 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -2,7 +2,7 @@
Name: x2goserver
Version: 4.0.1.9
Release: 2%{?dist}
-Summary: X2Go server daemon scripts
+Summary: X2Go Server
Group: Applications/Communications
License: GPLv2+
@@ -31,6 +31,8 @@ BuildRequires: man
BuildRequires: xorg-x11-xinit
# For x2goruncommand - for now
Requires: bc
+# For x2goshowblocks
+Requires: lsof
# For netstat in x2goresume-session
Requires: net-tools
Requires: openssh-server
@@ -39,6 +41,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl}
-V:version`"; echo $versi
Requires: perl(DBD::SQLite)
# For killall in x2gosuspend-session
Requires: psmisc
+# For x2godbadmin
Requires: pwgen
# For printing, file-sharing
Requires: sshfs
@@ -56,7 +59,7 @@ Requires(pre): shadow-utils
X2Go is a server based computing environment with
- session resuming
- low bandwidth support
- - LDAP support
+ - session brokerage support
- client side mass storage mounting support
- audio support
- authentication by smartcard and USB stick
@@ -66,11 +69,11 @@ administrations.
%package printing
-Summary: X2Go server printing support
+Summary: X2Go Server printing support
Requires: %{name} = %{version}-%{release}
%description printing
-The X2Go server printing package provides client-side printing support for
+The X2Go Server printing package provides client-side printing support for
X2Go.
This package has to be installed on X2Go servers that shall be able to pass
@@ -140,8 +143,9 @@ exit 0
%post
# Initialize the session database
-[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] &&
- %{_sbindir}/x2godbadmin --createdb || :
+[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] &&
+ egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1
&&
+ %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || :
%if 0%{?fedora}
%systemd_post x2gocleansessions.service
@@ -175,15 +179,10 @@ exit 0
%files
-%doc debian/copyright
+%doc debian/changelog debian/copyright
%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver
%dir %{_sysconfdir}/x2go/
%config(noreplace) %{_sysconfdir}/x2go/x*
-# xsession - disabled for now
-#%config(noreplace) %{_sysconfdir}/x2go/Xsession.options
-#%{_sysconfdir}/x2go/Xresources
-#%{_sysconfdir}/x2go/Xsession
-#%{_sysconfdir}/x2go/Xsession.d
%{_bindir}/x2go*
%exclude %{_bindir}/x2goprint
%dir %{_libdir}/x2go
@@ -222,10 +221,10 @@ exit 0
%files printing
%{_bindir}/x2goprint
-%{_mandir}/man8/x2goprint.8.gz
%{_datadir}/x2go/versions/VERSION.x2goserver-printing
%{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features
%attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint
+%{_mandir}/man8/x2goprint.8.gz
%changelog
* Sat Dec 7 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.9-2
Show replies by date