This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit f6b52a692f50b11034a40fdf6c28b11fec1cf947 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 7 06:08:55 2017 +0100 x2goserver.spec: pull in shared-mime-info as a build requirement only on *SuSE and add comment regarding why desktop-file-utils is always needed. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver.spec | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 102651e..baf7073 100644 --- a/debian/changelog +++ b/debian/changelog @@ -283,6 +283,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - Contrary to other information that says "brackets" and consistent with RPM's source code, grouping is done via "(" and ")" in conditions. - More platform-specific condition fixup. + - Pull in shared-mime-info as a build requirement only on *SuSE and add + comment regarding why desktop-file-utils is always needed. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index 3991bef..26788db 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -26,11 +26,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: findutils -%if 0%{?suse_version} || 0%{?suse_version} <= 1130 -BuildRequires: shared-mime-info +# We need this package for SuSE-specific macros. +# RHEL-based systems should be fine without them, but +# further checking with rpmlint is required. +%if 0%{?suse_version} +BuildRequires: shared-mime-info %endif +# Always needed, on all platforms, for desktop-file-validate. BuildRequires: desktop-file-utils + %if 0%{?fedora} || 0%{?rhel} BuildRequires: perl-generators %endif -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git