[X2Go-Commits] [x2goserver] 01/02: x2goserver.spec: add shadow/shadow-utils/pwdutils Requires to x2goserver-printing sub package.
git-admin at x2go.org
git-admin at x2go.org
Fri Mar 27 07:55:45 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 dd70d3ed11c745b21283cdca1e495b0a3d13d2a9
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Mar 27 07:50:29 2015 +0100
x2goserver.spec: add shadow/shadow-utils/pwdutils Requires to x2goserver-printing sub package.
---
debian/changelog | 2 ++
x2goserver.spec | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0ce2094..5d38f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -187,6 +187,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
- Fix installation on OpenSUSE 12.3 and higher: has replaced pwdutils with
shadow. Also affects SLE{S,D} 12.
- Add workaround documentation for sudoers on *SUSE 11.
+ - Add shadow/shadow-utils/pwdutils Requires to x2goserver-printing
+ sub package.
-- 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 866af17..6f2bf5a 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -301,6 +301,24 @@ Requires: perl = %{perl_version}
%else
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%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
+
%if 0%{?fedora} || 0%{?rhel}
Group: Applications/Communications
%else
--
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