[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: Requires (x2goserver-xsession): SUSE <= 11.3 has xorg-x11, not xinit.

[git-admin at x2go.org]

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

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit c7232329ff0f639ecf4cd64ad5ea1862c4a58ed2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 30 07:12:49 2015 +0100

    x2goserver.spec: Requires (x2goserver-xsession): SUSE <= 11.3 has xorg-x11, not xinit.
---
 debian/changelog |    3 ++-
 x2goserver.spec  |    4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ccdabc3..7196b07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -101,7 +101,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
       Fedora/RHEL7. (Fixes: 698).
     + Create system user x2gouser with $HOME in /var/lib/x2go. (Fixes: #697).
     + Always set BuildRoot: parameter.
-    + BuildRequires: SUSE <= 11.3 has xorg-x11, xinit.
+    + BuildRequires: SUSE <= 11.3 has xorg-x11, not xinit.
+    + Requires (x2goserver-xsession): SUSE <= 11.3 has xorg-x11, not xinit.
     + No Bashisms in scriptlets.
     + rpmlint requires xdg-utils at build time.
 
diff --git a/x2goserver.spec b/x2goserver.spec
index fc8702b..cfe9c72 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -219,7 +219,11 @@ Summary:        X2Go Server (Xsession runner)
 Requires:       %{name} = %{version}-%{release}
 # For /etc/X11/Xresources
 %if 0%{?suse_version}
+%if 0%{?suse_version} <= 1130
+Requires:       xorg-x11
+%else
 Requires:       xinit
+%endif
 %else
 Requires:       xorg-x11-xinit
 %endif

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