This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gomatebindings. commit 545e9801c22d558075cc3fc351f57cf821087b84 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 24 06:48:40 2015 +0100 x2gomatebindings.spec: make *SUSE ignore mate-menus-upstream. A choice is bad in this case, leading to a build failure. --- debian/changelog | 2 ++ x2gomatebindings.spec | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 99850f3..277b714 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low - Fix a typo in if condition. - Let Fedora/EPEL depend on x2goserver-extensions again. We're now adding our own repositories to the build config. + - Make *SUSE ignore mate-menus-upstream. A choice is bad in this case, + leading to a build failure. -- X2Go Release Manager <git-admin@x2go.org> Tue, 10 Feb 2015 23:48:43 +0100 diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec index 49b80be..c678da2 100644 --- a/x2gomatebindings.spec +++ b/x2gomatebindings.spec @@ -26,6 +26,12 @@ BuildRequires: desktop-file-utils BuildRequires: filesystem BuildRequires: x2goserver >= 4.0.1.4 BuildRequires: x2goserver-extensions +# The next conditional is used to mark mate-menus-upstream as a bad option +# for the virtual package mate-menus. +# It will then use mate-menus-openSUSE or mate-menus-suse. +%if 0%{?suse_version} +#!BuildIgnore: mate-menus-upstream +%endif BuildRequires: mate-menus BuildRequires: mate-icon-theme -- Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git