[X2Go-Commits] [x2goserver] 04/08: x2goserver.spec: pull in dbus-run-session if possible.

git-admin at x2go.org git-admin at x2go.org
Wed Nov 1 10:23:26 CET 2017


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 4445a14e686533eb6bdce6320287dcb0ab819250
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Nov 1 08:40:13 2017 +0100

    x2goserver.spec: pull in dbus-run-session if possible.
    
    Only available on Fedora, SLE12+ and OpenSuSE 13+.
---
 debian/changelog |  2 ++
 x2goserver.spec  | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ac5554a..d20b570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,6 +92,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
       of errors. Split these up into nested conditions.
     - There is no %trans scriptlet, we're using %posttrans, so the dependency
       should be specified as Requires(posttrans) as well.
+    - Pull in dbus-run-session if possible. Only available on Fedora, SLE12+
+      and OpenSuSE 13+.
   * debian/po:
     - Tiny fixup on author name.
   * debian/control:
diff --git a/x2goserver.spec b/x2goserver.spec
index b800a25..2981fb7 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -277,6 +277,28 @@ Requires:       xinit
 %else
 Requires:       xorg-x11-xinit
 %endif
+
+# dbus-run-session is tricky, so using a separate section for it.
+# For *SuSE:
+#   It's only available on SLE 12+ and OpenSuSE 13+.
+#   With OpenSuSE Leap 42.3, it was migrated from dbus-1-x11 to dbus-1.
+# For CentOS:
+#   Not available at all.
+# For Fedora:
+#   Supported on all versions we care about as part of the dbus package.
+%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1300
+%if 0%{?sle_version} >= 120300 && 0%{?is_opensuse}
+Requires:       dbus-1
+%else
+Requires:       dbus-1-x11
+%endif
+%endif
+%endif
+%if 0%{?fedora}
+Requires:       dbus
+%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