This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 634cf79 x2goserver.spec: contrary to other information that says "brackets" and consistent with RPM's source code, grouping is done via "(" and ")" in conditions. new 3fd04b0 x2goserver.spec: more platform-specific condition fixup. new f6b52a6 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. 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 +++ x2goserver.spec | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 3fd04b02a0ca96cf005e4de4360f60a2a4b39f35 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 7 05:59:10 2017 +0100 x2goserver.spec: more platform-specific condition fixup. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ef2d5f8..102651e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -282,6 +282,7 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - Fix typo in %if condition (0%?{?fedora} instead of 0%{?fedora}.) - 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. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index 60c7823..3991bef 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -459,7 +459,7 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif Requires: xdg-utils -%if 0%{?suse_version} || 0%{?fedora} < 25 || 0%{?rhel} < 8 +%if 0%{?suse_version} || ( 0%{?fedora} && 0%{?fedora} < 25 ) || ( 0%{?rhel} && 0%{?rhel} < 8 ) Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %endif -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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
-
git-admin＠x2go.org