This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 603028b Replace historical "egrep" with "grep -E". new e8a78be Systemd support for SUSE >= 12.10. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + x2goserver.spec | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit e8a78be138a107b71faf007817b24de36c9a341f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 14 05:06:34 2014 +0200 Systemd support for SUSE >= 12.10. --- debian/changelog | 1 + x2goserver.spec | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7cedda6..e9214e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -166,6 +166,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + Use proper if... then... clauses. + For SUSE builds: Add to R: shadow (useradd, groupadd). + Replace historical "egrep" with "grep -E". + + Systemd support for SUSE >= 12.10. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index 879af01..0dfd76a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -22,14 +22,17 @@ BuildRequires: desktop-file-utils BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: man2html-core -BuildRequires: systemd %else BuildRequires: man %endif +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif +# for useradd/groupadd +BuildRequires: shadow # So XSESSIONDIR gets linked -%if 0%{suse_version} +%if 0%{?suse_version} BuildRequires: xinit -BuildRequires: shadow %else BuildRequires: xorg-x11-xinit %endif @@ -40,7 +43,7 @@ Requires: lsof # For netstat in x2goresume-session Requires: net-tools Requires: openssh-server -%if 0%{suse_version} +%if 0%{?suse_version} Requires: perl %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -89,7 +92,7 @@ administrations. %package common Summary: X2Go Server (common files) -%if 0%{suse_version} +%if 0%{?suse_version} Requires: perl %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -114,7 +117,7 @@ Summary: Perl X2Go::Server package Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl-X2Go-Server-DB = %{version}-%{release} -%if 0%{suse_version} +%if 0%{?suse_version} Requires: perl %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -139,7 +142,7 @@ Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl(DBD::SQLite) Requires: perl(DBD::Pg) -%if 0%{suse_version} +%if 0%{?suse_version} Requires: perl %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -161,7 +164,7 @@ This package contains the X2Go::Server::DB Perl package. %package -n perl-X2Go-Log Summary: Perl X2Go::Log package Requires: x2goserver-common = %{version}-%{release} -%if 0%{suse_version} +%if 0%{?suse_version} Requires: perl %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -183,7 +186,7 @@ This package contains the X2Go::Log Perl package. %package printing Summary: X2Go Server (printing support) Requires: %{name} = %{version}-%{release} -%if 0%{suse_version} +%if 0%{?suse_version} Requires: perl %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -320,7 +323,7 @@ touch %{buildroot}%{_localstatedir}/x2go/x2go_sessions # Printing spool dir mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint -%if 0%{?fedora} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 # System.d session cleanup script mkdir -p %{buildroot}%{_unitdir} install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} @@ -333,6 +336,8 @@ install -pm0755 %SOURCE2 %{buildroot}%{_initrddir}/x2goserver mkdir -p %{buildroot}%{_initddir} install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver %endif +%if 0%{?suse_version} +ln -sf %{_initddir}/x2goserver %{buildroot}%{_sbindir}/rcx2goserver %endif %if 0%{?el5} @@ -366,7 +371,7 @@ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null; th fi fi -%if 0%{?fedora} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %systemd_post x2goserver.service %preun @@ -461,7 +466,7 @@ exit 0 %dir %{_localstatedir} %attr(0775,root,x2gouser) %dir %{_localstatedir}/x2go/ %ghost %attr(0660,root,x2gouser) %{_localstatedir}/x2go/x2go_sessions -%if 0%{?fedora} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %{_unitdir}/x2goserver.service %else %if 0%{?el5} @@ -469,6 +474,8 @@ exit 0 %else %{_initddir}/x2goserver %endif +%if 0%{?suse_version} +%{_sbindir}/rcx2goserver %endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org