[X2Go-Commits] [x2godesktopsharing] 02/02: x2godesktopsharing.spec: add Pre-dependencies on shadow/pwdutils/shadow-utils for scriptlets.
git-admin at x2go.org
git-admin at x2go.org
Mon Nov 12 19:48:50 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2godesktopsharing.
commit 3e228af6229a4b86f6c76e36ce872e7440167f13
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 12 19:48:31 2018 +0100
x2godesktopsharing.spec: add Pre-dependencies on shadow/pwdutils/shadow-utils for scriptlets.
---
debian/changelog | 1 +
x2godesktopsharing.spec | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 12a5815..41cc6e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
+ Pull in redhat-rpm-config manually. This should probably be done by
something else, like... gcc or qmake or qt(4)-dev, but it isn't.
+ Whitespace only.
+ + Add Pre-dependencies on shadow/pwdutils/shadow-utils for scriptlets.
[ Mike Gabriel ]
* New upstream version (3.1.1.5):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 6bf3be0..e9ca266 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -34,6 +34,23 @@ BuildRequires: qt-devel
%endif
%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, but we don't care.
+%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}
# For some reason qt(4)-dev doesn't depend upon redhat-rpm-config,
# but the GCC spec file is still used, which leads to gcc failing
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
More information about the x2go-commits
mailing list