[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: fix installation on OpenSUSE 12.3 and higher: has replaced pwdutils with shadow. Also affects SLE{S, D} 12.

git-admin at x2go.org git-admin at x2go.org
Fri Mar 27 06:13:56 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 097c241dc9cffc8fb7a4ff818dd7b556df4981bc
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Mar 27 06:13:00 2015 +0100

    x2goserver.spec: fix installation on OpenSUSE 12.3 and higher: has replaced pwdutils with shadow. Also affects SLE{S,D} 12.
---
 debian/changelog |    2 ++
 x2goserver.spec  |    8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5d8a097..768af5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -184,6 +184,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
       available on *SUSE, FC < 20 and RHEL, so for those distros still own the
       directories.
     - Typo fix in comment: Recommands -> Recommends.
+    - Fix installation on OpenSUSE 12.3 and higher: has replaced pwdutils with
+      shadow. Also affects SLE{S,D} 12.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 24 Feb 2015 22:11:49 +0100
 
diff --git a/x2goserver.spec b/x2goserver.spec
index 63f2872..982f853 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -44,13 +44,21 @@ BuildRequires:  systemd
 %endif
 
 # for useradd/groupadd
+# OpenSUSE 12.3 and SLE{S,D} 12 (has suse_version 1315) switched to shadow.
+%if 0%{?suse_version} >= 1230
+BuildRequires:  shadow
+Requires(pre):  shadow
+%else
+# Older SuSE versions (prior to 12.3) only have pwdutils.
 %if 0%{?suse_version}
 BuildRequires:  pwdutils
 Requires(pre):  pwdutils
+# Fedora, EPEL and RedHat use shadow-utils.
 %else
 BuildRequires:  shadow-utils
 Requires(pre):  shadow-utils
 %endif
+%endif
 
 # So XSESSIONDIR gets linked
 %if 0%{?suse_version}

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list