[X2Go-Commits] [x2gomatebindings] 02/02: x2gomatebindings.spec: fix FC conditionals, the macro is called "fedora", not "fedora_version".

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

commit 1a94bf29ec81c3f1ff8fa8add7ef45c4a260b68c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 11 21:10:05 2016 +0200

    x2gomatebindings.spec: fix FC conditionals, the macro is called "fedora", not "fedora_version".
    
    Also catch some non-*SuSE*/-Fedora "edge cases".
---
 debian/changelog      |    2 ++
 x2gomatebindings.spec |   11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6abca8a..328fb6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low
       should be handled automatically.
     - Switch to GTK 3 for Fedora 25 and up.
     - Don't automatically configure after running autogen.sh.
+    - Fix FC conditionals, the macro is called "fedora", not "fedora_version".
+      Also catch some non-*SuSE*/-Fedora "edge cases".
   * 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 ed960c7..8523af9 100644
--- a/x2gomatebindings.spec
+++ b/x2gomatebindings.spec
@@ -40,13 +40,16 @@ BuildRequires:  mate-icon-theme
 
 %if 0%{?suse_version}
 BuildRequires:  pkgconfig(gtk+-2.0)
-%endif
-%if 0%{?fedora_version}
-%if 0%{?fedora_version} >= 25
+%else
+%if 0%{?fedora}
+%if 0%{?fedora} >= 25
 BuildRequires:  gtk3-devel
 %else
 BuildRequires:  gtk2-devel
 %endif
+%else
+BuildRequires:  gtk2-devel
+%endif
 %endif
 
 Requires:       x2goserver >= 4.0.1.4
@@ -89,7 +92,7 @@ if [ ! -e configure ]; then
 fi;
 # Remember to switch to --with-gtk=3.0 once OpenSuSE already provides a newer MATE version compiled against GTK 3.
 # Fedora will switch to GTK 3 with FC25.
-%if 0%{?fedora_version} && 0%{?fedora_version} >= 25
+%if 0%{?fedora} && 0%{?fedora} >= 25
 %configure --with-gtk=3.0
 %else
 %configure --with-gtk=2.0

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