[X2Go-Commits] [x2golxdebindings] 01/01: x2golxdebindings.spec: remove faulty "or" dependency.

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

commit 5374f33ff159b2be222b01744d8cc8d3295ce291
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun May 3 21:20:51 2015 +0200

    x2golxdebindings.spec: remove faulty "or" dependency.
    
    Replace with libfm-*-based dependencies, which should automatically pull in
    GTK2 or GTK3. (Most likely GTK3 anyway.)
---
 debian/changelog      |    6 +++++-
 x2golxdebindings.spec |   13 ++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 825f743..91daff2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 x2golxdebindings (1.0.2.4-0x2go1) UNRELEASED; urgency=low
 
-  * Continue development
+  [ Mihai Moldovan ]
+  * x2golxdebindings.spec:
+    - Remove faulty "or" dependency, replace with libfm-*-based dependencies,
+      which should automatically pull in GTK2 or GTK3. (Most likely GTK3
+      anyway.)
 
  -- X2Go Release Manager <git-admin at x2go.org>  Wed, 11 Feb 2015 00:14:45 +0100
 
diff --git a/x2golxdebindings.spec b/x2golxdebindings.spec
index cdcc79c..eb795d3 100644
--- a/x2golxdebindings.spec
+++ b/x2golxdebindings.spec
@@ -26,7 +26,18 @@ Requires: nuoveXT2-icon-them
 Requires: lxde-icon-theme
 %endif
 Requires: desktop-file-utils
-Requires: gtk2 or gtk3
+
+# We also depend on gtk2 or gtk3 for gkt-update-icon-cache. However, there
+# does not appear to be a way to specify a dependency on gtk2 or gtk3, so
+# let's assume that if packages like libfm-gtk-devel are installed,
+# then gtk2 or gtk3 are available.
+%if 0%{?suse_version}
+Requires: libfm-gtk3-3
+BuildRequires: libfm-devel
+%else
+Requires: libfm-gtk
+BuildRequires: libfm-gtk-devel
+%endif
 
 %if 0%{?el5}
 # For compatibility with EPEL5

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