[X2Go-Commits] [x2gomatebindings] 01/01: x2gomatebindings: don't depend on x2goserver-extensions on Fedora/EPEL. Remove once Orion makes x2goserver also provide x2goserver-extensions.

git-admin at x2go.org git-admin at x2go.org
Wed Mar 18 06:59:46 CET 2015


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

x2go pushed a commit to branch master
in repository x2gomatebindings.

commit 926c4cf452fbfe1b8b9bfe052d739df5f43f9ac1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Mar 18 06:59:32 2015 +0100

    x2gomatebindings: don't depend on x2goserver-extensions on Fedora/EPEL. Remove once Orion makes x2goserver also provide x2goserver-extensions.
---
 debian/changelog      |    2 ++
 x2gomatebindings.spec |   12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 142d205..8ff3d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low
     - Only own files, do not blindly own complete (and alien!) directories.
       Fixes: #822.
     - Add missing BuildRequires: and Requires: for file and directory owning.
+    - Don't depend on x2goserver-extensions on Fedora/EPEL. Remove once Orion
+      makes x2goserver also provide x2goserver-extensions.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 10 Feb 2015 23:48:43 +0100
 
diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec
index 49b80be..80f1055 100644
--- a/x2gomatebindings.spec
+++ b/x2gomatebindings.spec
@@ -24,13 +24,25 @@ BuildRequires:  desktop-file-utils
 
 # For directory owning only.
 BuildRequires:  filesystem
+# This condition can safely be removed once Orion makes x2goserver provide
+# x2goserver-extensions on Fedora/EPEL.
+%if 0{?suse_version}
 BuildRequires:  x2goserver >= 4.0.1.4
 BuildRequires:  x2goserver-extensions
+%else
+BuildRequires:  x2goserver >= 4.0.1.4
+%endif
 BuildRequires:  mate-menus
 BuildRequires:  mate-icon-theme
 
+# This condition can safely be removed once Orion makes x2goserver provide
+# x2goserver-extensions on Fedora/EPEL.
+%if 0{?suse_version}
 Requires:       x2goserver >= 4.0.1.4
 Requires:       x2goserver-extensions
+%else
+Requires:       x2goserver >= 4.0.1.4
+%endif
 Requires:       zenity
 Requires:       mate-menus
 Requires:       desktop-file-utils

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


More information about the x2go-commits mailing list