This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gomatebindings. from 75fd286 debian/rules: don't automatically configure after running autogen.sh. new f013991 debian/rules: override "testing" string with a hardcoded version value as well. new 1a94bf2 x2gomatebindings.spec: fix FC conditionals, the macro is called "fedora", not "fedora_version". The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ debian/rules | 5 ++++- x2gomatebindings.spec | 11 +++++++---- 3 files changed, 14 insertions(+), 5 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git
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@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@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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gomatebindings. commit f0139910f8b9f0c42b6e8e42a7ee9377252ed207 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 18:32:47 2016 +0200 debian/rules: override "testing" string with a hardcoded version value as well. --- debian/changelog | 1 + debian/rules | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6ab4d67..6abca8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,7 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low - Drop debugging output (which only leads to failing builds on all platforms) and consolidate default values. - Don't automatically configure after running autogen.sh. + - Override "testing" string with a hardcoded version value as well. -- X2Go Release Manager <git-admin@x2go.org> Tue, 10 Feb 2015 23:48:43 +0100 diff --git a/debian/rules b/debian/rules index 5a35886..918db80 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,10 @@ USE_GTK = 2.0 ifeq ($(shell dpkg-vendor --is Debian && echo yes),yes) RELEASE_VER = $(shell /usr/bin/lsb_release -r | /bin/sed -e 's/[ ]*//g' | /usr/bin/cut -d ':' -f '2' | /usr/bin/cut -d '.' -f '1') -# Let's fake unstable's "release version"... +# Let's fake testing's and unstable's "release version"... +ifeq ($(RELEASE_VER),testing) + RELEASE_VER = 9990 +endif ifeq ($(RELEASE_VER),unstable) RELEASE_VER = 9999 endif -- Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git
-
git-admin＠x2go.org