[X2Go-Commits] [x2gobroker] 02/04: Adapt to building on openSUSE/SLES.
git-admin at x2go.org
git-admin at x2go.org
Wed Oct 15 06:10:13 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 516e3b51328e12d6189e338568990517e06815c2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Oct 15 06:05:07 2014 +0200
Adapt to building on openSUSE/SLES.
---
debian/changelog | 1 +
x2gobroker.spec | 139 ++++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 121 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c415446..93e894d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -193,6 +193,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
sub-package.
+ Builds for EPEL-7 also have to systemd aware.
+ Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
+ + Adapt to building on openSUSE/SLES.
[ Josh Lukens ]
* New upstream version (0.0.3.0):
diff --git a/x2gobroker.spec b/x2gobroker.spec
index 682e554..489e872 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -2,21 +2,32 @@ Name: x2gobroker
Version: 0.0.3.0
Release: 0.0x2go1%{?dist}
Summary: X2Go Session Broker
+%if 0%{?suse_version}
License: AGPL-3.0+
+Group: Productivity/Networking/Remote Desktop
+%else
+License: AGPLv3+
Group: Applications/Communications
+%endif
Url: http://www.x2go.org/
Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz
Source1: x2gobroker-daemon.init
Source2: x2gobroker-authservice.init
+Source3: x2gobroker-rpmlintrc
%if 0%{?el5}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%endif
+%if 0%{?suse_version}
+BuildRequires: python-devel
+BuildRequires: fdupes
+%else
BuildRequires: python2-devel
+%endif
BuildRequires: python-setuptools
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
BuildRequires: systemd
%endif
Requires: logrotate
@@ -24,7 +35,12 @@ Requires: python-argparse
Requires: python-setproctitle
Requires: python-wsgilog
Requires(pre): python-x2gobroker = %{version}-%{release}
+
+%if 0%{?suse_version}
+Requires(pre): pwdutils
+%else
Requires(pre): shadow-utils
+%endif
%description
X2Go is a server based computing environment with
@@ -49,8 +65,16 @@ This package contains the x2gobroker executable.
%package -n python-x2gobroker
Summary: X2Go Session Broker (Python modules)
+%if 0%{?suse_version}
+Group: Productivity/Networking/Remote Desktop
+%else
Group: Applications/Communications
+%endif
+%if 0%{?suse_version}
+Requires: python
+%else
Requires: python2
+%endif
Requires: python-pampy
Requires: python-netaddr
Requires: python-tornado
@@ -82,8 +106,16 @@ This package contains the broker's Python library.
%package authservice
Summary: X2Go Session Broker (PAM authentication service)
+%if 0%{?suse_version}
+Group: Productivity/Networking/Remote Desktop
+%else
Group: Applications/Communications
+%endif
+%if 0%{?suse_version}
+Requires: python
+%else
Requires: python2
+%endif
Requires: python-argparse
Requires: python-setproctitle
Requires: python-pampy
@@ -113,7 +145,11 @@ against the PAM system.
%package daemon
Summary: X2Go Session Broker (standalone daemon)
+%if 0%{?suse_version}
+Group: Productivity/Networking/Remote Desktop
+%else
Group: Applications/Communications
+%endif
Requires: x2gobroker = %{version}-%{release}
Requires: x2gobroker-authservice = %{version}-%{release}
@@ -143,7 +179,11 @@ daemon.
%package ssh
Summary: X2Go Session Broker (SSH broker)
+%if 0%{?suse_version}
+Group: Productivity/Networking/Remote Desktop
+%else
Group: Applications/Communications
+%endif
Requires: x2gobroker = %{version}-%{release}
%description ssh
@@ -171,10 +211,18 @@ Servers).
%package wsgi
Summary: X2Go Session Broker (WSGI)
+%if 0%{?suse_version}
+Group: Productivity/Networking/Remote Desktop
+%else
Group: Applications/Communications
+%endif
Requires: x2gobroker = %{version}-%{release}
Requires: httpd, mod_wsgi
+%if 0%{?suse_version}
+Requires: python
+%else
Requires: python2
+%endif
Requires: x2gobroker-authservice = %{version}-%{release}
%description wsgi
@@ -202,9 +250,25 @@ into a running Apache2 httpd.
%package agent
Summary: X2Go Session Broker (remote agent)
+%if 0%{?suse_version}
+Group: Productivity/Networking/Remote Desktop
+%else
Group: Applications/Communications
+%endif
+%if 0%{?suse_version}
+%if 0%{?suse_version} < 1140
+Requires: perl = %{perl_version}
+%else
+%{perl_requires}
+%endif
+%else
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%endif
+%if 0%{?suse_version}
+Requires: python
+%else
Requires: python2
+%endif
Requires: python-setproctitle
Requires: python-argparse
Requires: python-paramiko
@@ -280,7 +344,7 @@ ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \
ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \
"$b/%_sysconfdir/httpd/vhosts.d/x2gobroker-wsgi.sample"
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
# System.d session cleanup script
mkdir -p %{buildroot}%{_unitdir}
install -pm0644 x2gobroker-daemon.service %{buildroot}%{_unitdir}
@@ -296,7 +360,7 @@ install -pm0755 %SOURCE2 \
install -pm0755 %SOURCE1 \
"$b/%_initrddir/x2gobroker-daemon"
%endif
-%if 0%{?el6}
+%if 0%{?el6} || ( 0%{?suse_version} && 0%{?suse_version} < 1140)
mkdir -p "$b/%_initddir"
install -pm0755 %SOURCE2 \
"$b/%_initddir/x2gobroker-authservice"
@@ -315,16 +379,26 @@ install -pm0755 %SOURCE1 \
%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" \
- -d "%_localstatedir/lib/x2gobroker" \
- -g x2gobroker -r -s /bin/bash x2gobroker || :;
+ if ! /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null; then \
+ /usr/sbin/useradd -c "X2Go Broker System User" \
+ -d "%_localstatedir/lib/x2gobroker" \
+ -g x2gobroker -r -s /bin/bash x2gobroker || :;
+ fi
fi;
+%if 0%{?suse_version} >= 1230
+%pre authservice
+%service_add_pre x2gobroker-authservice.service
+%endif
+
%post authservice
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
+%if 0%{?suse_version}
+%service_add_post x2gobroker-authservice.service
+%else
%systemd_post x2gobroker-authservice.service
+%endif
%else
/sbin/chkconfig --add x2gobroker-authservice
if [ "$1" -ge "1" ] ; then
@@ -333,8 +407,12 @@ fi
%endif
%preun authservice
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
+%if 0%{?suse_version}
+%service_del_preun x2gobroker-authservice.service
+%else
%systemd_preun x2gobroker-authservice.service
+%endif
%else
if [ "$1" = 0 ]; then
/sbin/service x2gobroker-authservice stop >/dev/null 2>&1
@@ -342,15 +420,28 @@ if [ "$1" = 0 ]; then
fi
%endif
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%postun authservice
+%if 0%{?suse_version}
+%service_del_postun x2gobroker-authservice.service
+%else
%systemd_postun x2gobroker-authservice.service
%endif
+%endif
+
+%if 0%{?suse_version} >= 1230
+%pre daemon
+%service_add_pre x2gobroker-daemon.service
+%endif
%post daemon
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
+%if 0%{?suse_version}
+%service_add_post x2gobroker-daemon.service
+%else
%systemd_post x2gobroker-daemon.service
+%endif
%else
/sbin/chkconfig --add x2gobroker-daemon
if [ "$1" -ge "1" ] ; then
@@ -359,8 +450,12 @@ fi
%endif
%preun daemon
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
+%if 0%{?suse_version}
+%service_del_preun x2gobroker-daemon.service
+%else
%systemd_preun x2gobroker-daemon.service
+%endif
%else
if [ "$1" = 0 ]; then
/sbin/service x2gobroker-daemon stop >/dev/null 2>&1
@@ -368,10 +463,14 @@ if [ "$1" = 0 ]; then
fi
%endif
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%postun daemon
+%if 0%{?suse_version}
+%service_del_postun x2gobroker-daemon.service
+%else
%systemd_postun x2gobroker-daemon.service
%endif
+%endif
%post ssh
@@ -382,14 +481,15 @@ fi;
%pre agent
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" \
- -d "%_localstatedir/lib/x2gobroker" \
- -g x2gobroker -r -s /bin/bash x2gobroker || :;
+ if ! /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null; then \
+ /usr/sbin/useradd -c "X2Go Broker System User" \
+ -d "%_localstatedir/lib/x2gobroker" \
+ -g x2gobroker -r -s /bin/bash x2gobroker || :;
fi;
%files
+%defattr(-,root,root)
%_bindir/x2gobroker
%_bindir/x2gobroker-testauth
%_sbindir/x2gobroker-keygen
@@ -400,6 +500,7 @@ fi;
%files -n python-x2gobroker
+%defattr(-,root,root)
%config(noreplace) %_sysconfdir/x2go
%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf
%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost
@@ -419,7 +520,7 @@ fi;
%if 0%{?el6}
%_initddir/x2gobroker-authservice
%endif
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%{_unitdir}/x2gobroker-authservice.service
%endif
%if 0%{?el5} || 0%{?el6}
@@ -439,7 +540,7 @@ fi;
%if 0%{?el6}
%_initddir/x2gobroker-daemon
%endif
-%if 0%{?fedora} || 0%{?el7}
+%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%{_unitdir}/x2gobroker-daemon.service
%endif
%if 0%{?el5} || 0%{?el6}
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list