[X2Go-Commits] [x2gobroker] 01/01: On SUSE, we have to provide our own python-pampy package (and depend on that). In Fedora and RHEL, the same (upstream) software is named python-pam. (Fixes: #562).

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gobroker.

commit f0e9c516dcb79597b3a32a2a4ec865db15c02f94
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 28 16:32:42 2014 +0100

    On SUSE, we have to provide our own python-pampy package (and depend on that). In Fedora and RHEL, the same (upstream) software is named python-pam. (Fixes: #562).
---
 debian/changelog |    3 +++
 x2gobroker.spec  |    4 ++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 28082c1..73161a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -203,6 +203,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     + Don't package x2gobroker-daemon.1 nor x2gobroker-ssh.1 man pages
       twice.
     + On SUSE, we have /etc/apache2, not /etc/httpd.
+    + On SUSE, we have to provide our own python-pampy package (and depend on
+      that). In Fedora and RHEL, the same (upstream) software is named
+      python-pam. (Fixes: #562).
 
   [ Josh Lukens ]
   * New upstream version (0.0.3.0):
diff --git a/x2gobroker.spec b/x2gobroker.spec
index 0ec9efc..e88424e 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -71,7 +71,11 @@ Requires:       python
 %else
 Requires:       python2
 %endif
+%if 0%{?suse_version}
 Requires:       python-pampy
+%else
+Requires:       python-pam
+%endif
 Requires:       python-netaddr
 Requires:       python-tornado
 Requires:       python-paramiko

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