[X2Go-Commits] [x2goserver] 01/01: Additionally adapt to building on openSUSE/SLES.

[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 x2goserver.

commit 17fd0c4d92cd886077939816dcf7ec47e7ffa61b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 13 14:40:41 2014 +0200

    Additionally adapt to building on openSUSE/SLES.
---
 debian/changelog |    1 +
 x2goserver.spec  |    4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba7ed8f..4fec775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -144,6 +144,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     + Add D (x2goserver): libfile-which-perl.
   * x2goserver.spec:
     + Add to R: perl(File::Which).
+    + Additionally adapt to building on openSUSE/SLES.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 07 Oct 2014 15:35:38 +0200
 
diff --git a/x2goserver.spec b/x2goserver.spec
index 61391da..cdcba25 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -27,7 +27,11 @@ BuildRequires:  systemd
 BuildRequires:  man
 %endif
 # So XSESSIONDIR gets linked
+%if 0%{suse_version}
+BuildRequires:  xinit
+%else
 BuildRequires:  xorg-x11-xinit
+%fi
 # For x2goruncommand - for now
 Requires:       bc
 # For x2goshowblocks

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