[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-124-g4c738f9
X2Go dev team
git-admin at x2go.org
Thu Dec 19 22:51:24 CET 2013
The branch, master has been updated
via 4c738f9ac94a649c5ce51968c3d708a4b6830af0 (commit)
from f2e898266e4e0637743257d860fc3fa54a8004d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4c738f9ac94a649c5ce51968c3d708a4b6830af0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Dec 19 22:51:18 2013 +0100
Split out python-x2gobroker sub-package. Install Apache2 config symlinks to /etc/httpd (not /etc/apache2).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
x2gobroker.spec | 74 ++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 55 insertions(+), 21 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index adaa778..6507211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
* x2gobroker.spec:
+ Provide x2gobroker.spec file for building RPM packages. Inspired by
the packaging work in OpenSuSE.
+ + Split out python-x2gobroker sub-package.
+ + Install Apache2 config symlinks to /etc/httpd (not /etc/apache2).
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200
diff --git a/x2gobroker.spec b/x2gobroker.spec
index 90ccc30..04763eb 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -21,12 +21,9 @@ BuildRequires: systemd
%endif
Requires: logrotate
Requires: python-argparse
-Requires: python-netaddr
-Requires: python-pampy
-Requires: python-paramiko
Requires: python-setproctitle
-Requires: python-tornado
Requires: python-wsgilog
+Requires: python-x2gobroker = %{version}-%{release}
Requires(pre): shadow-utils
%description
@@ -50,6 +47,37 @@ X2Go server farms.
This package contains the x2gobroker executable.
+%package -n python-x2gobroker
+Summary: X2Go Session Broker (Python modules)
+Group: Applications/Communications
+Requires: python2
+Requires: python-pampy
+Requires: python-netaddr
+Requires: python-tornado
+Requires: paramiko
+
+%description -n python-x2gobroker
+X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - client side printing support
+ - audio support
+ - authentication by smartcard and USB stick
+
+The session broker is a server tool for X2Go that
+tells your X2Go Client application in a terminal
+server cluster what servers and session types are
+most appropriate for the user in front of the
+X2Go terminal.
+
+A session broker is most useful in load balanced
+X2Go server farms.
+
+This package contains the broker's Python library.
+
+
%package authservice
Summary: X2Go Session Broker (PAM authentication service)
Group: Applications/Communications
@@ -57,7 +85,7 @@ Requires: python2
Requires: python-argparse
Requires: python-setproctitle
Requires: python-pampy
-Requires: x2gobroker = %{version}-%{release}
+Requires: python-x2gobroker = %{version}-%{release}
%description authservice
X2Go is a server based computing environment with
@@ -209,11 +237,11 @@ make install PREFIX="%_prefix" LIBDIR="%_libexecdir/x2go" DESTDIR="$b"
# Somewhat distro specific (especially the paths), thus this was not
# done in the shipped tarball's Makefile
#
-mkdir -p "$b/%_sysconfdir/apache2"/{conf.d,vhosts.d}
+mkdir -p "$b/%_sysconfdir/httpd"/{conf.d,vhosts.d}
ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \
- "$b/%_sysconfdir/apache2/conf.d/x2gobroker-wsgi.conf"
+ "$b/%_sysconfdir/httpd/conf.d/x2gobroker-wsgi.conf"
ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \
- "$b/%_sysconfdir/apache2/vhosts.d/x2gobroker-wsgi.sample"
+ "$b/%_sysconfdir/httpd/vhosts.d/x2gobroker-wsgi.sample"
%if 0%{?fedora}
# System.d session cleanup script
@@ -244,7 +272,7 @@ install -pm0755 %SOURCE1 \
%fdupes %buildroot/%_prefix
%endif
-%pre
+%pre -n python-x2gobroker
if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then
/usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null || \
/usr/sbin/useradd -c "X2Go Broker System User" \
@@ -252,7 +280,7 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group
-g x2gobroker -r -s /bin/bash x2gobroker || :;
fi;
-%preun
+%preun -n python-x2gobroker
if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && ! [ -f %_libexecdir/x2go/x2gobroker-agent ]; then
/usr/sbin/userdel x2gobroker;
fi;
@@ -330,20 +358,25 @@ if /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && ! type x2gobroker;
fi;
%files
-%config %_sysconfdir/default/python-x2gobroker
-%config %_sysconfdir/pam.d
-%config(noreplace) %_sysconfdir/x2go
-%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf
-%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost
-
%_bindir/x2gobroker
%_bindir/x2gobroker-testauth
%_sbindir/x2gobroker-keygen
-%python_sitelib/x2gobroker*
%_mandir/man1/x2gobroker*.1*
%_mandir/man8/x2gobroker-keygen.8*
+%files -n python-x2gobroker
+%config(noreplace) %_sysconfdir/x2go
+%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf
+%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost
+%config %_sysconfdir/pam.d
+%config %_sysconfdir/default/python-x2gobroker
+%python_sitelib/x2gobroker*
+%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker
+%attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker
+%config %_sysconfdir/logrotate.d/x2gobroker-daemon
+
+
%files authservice
%defattr(-,root,root)
%_initddir/x2gobroker-authservice
@@ -357,16 +390,15 @@ fi;
%defattr(-,root,root)
%_initddir/x2gobroker-daemon
%config %_sysconfdir/default/x2gobroker-daemon
-%config %_sysconfdir/logrotate.d/x2gobroker-daemon
-%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker
-%attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker
%_sbindir/x2gobroker-daemon-debug
%_mandir/man8/x2gobroker-daemon-debug.8*
%files wsgi
%defattr(-,root,root)
-%_sysconfdir/apache2
+%_sysconfdir/httpd
+%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf
+%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost
%config %_sysconfdir/logrotate.d/x2gobroker-wsgi
hooks/post-receive
--
x2gobroker.git (HTTP(S) Session broker for X2Go)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).
More information about the x2go-commits
mailing list