[X2Go-Commits] [x2gomatebindings] 03/04: x2gomatebindings.spec: re-add explicit GTK library build dependencies.

git-admin at x2go.org git-admin at x2go.org
Sat Jun 11 16:54:06 CEST 2016


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

x2go pushed a commit to branch master
in repository x2gomatebindings.

commit 3b45d99383622668c721f8d8acf4f2606e917b77
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 11 16:52:58 2016 +0200

    x2gomatebindings.spec: re-add explicit GTK library build dependencies.
    
    Run-time dependencies should be handled automatically.
---
 debian/changelog      |    2 ++
 x2gomatebindings.spec |   15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d84b816..050e9d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low
       OpenSuSE 13.2 and SLE{S,D} 12.
     - Switch to use -symbolic icons on OpenSUSE 13.2 and 42.1.
     - Prepare GTK library version switching and hardcode GTK 2 for now.
+    - Re-add explicit GTK library build dependencies. Run-time dependencies
+      should be handled automatically.
   * debian/control:
     - Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
     - Whitespace only.
diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec
index 853b343..2b2f855 100644
--- a/x2gomatebindings.spec
+++ b/x2gomatebindings.spec
@@ -38,6 +38,17 @@ BuildRequires:  x2goserver-extensions
 BuildRequires:  mate-menus
 BuildRequires:  mate-icon-theme
 
+%if 0%{?suse_version}
+BuildRequires:  pkgconfig(gtk+-2.0)
+%endif
+%if 0%{?fedora_version}
+%if 0%{?fedora_version} >= 25
+BuildRequires:  gtk3-devel
+%else
+BuildRequires:  gtk2-devel
+%endif
+%endif
+
 Requires:       x2goserver >= 4.0.1.4
 Requires:       x2goserver-extensions
 Requires:       zenity
@@ -54,10 +65,6 @@ Requires:       gnome-icon-theme-symbolic
 Requires:       filesystem
 Requires:       mate-icon-theme
 
-# We also depend on gtk2 or gtk3. 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 mate-menus are installed, then gtk2 or gtk3 are
-# installed.
 
 %description
 X2Go is a server based computing environment with

--
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