[X2Go-Commits] [x2goserver] 01/02: x2goserver.spec: also add a trans(action)-requirement on shared-mime-info for older RHEL-based distros.

git-admin at x2go.org git-admin at x2go.org
Tue Mar 7 07:00:19 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit ead30c1ed1311704b383b9354979a6cf7ea56e37
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Mar 7 06:16:08 2017 +0100

    x2goserver.spec: also add a trans(action)-requirement on shared-mime-info for older RHEL-based distros.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog | 2 ++
 x2goserver.spec  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index baf7073..a955bf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -285,6 +285,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
     - 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.
+    - Also add a trans(action)-requirement on shared-mime-info for older
+      RHEL-based distros.
   * debian/po:
     - Tiny fixup on author name.
   * debian/control:
diff --git a/x2goserver.spec b/x2goserver.spec
index 26788db..b96f96e 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -467,6 +467,9 @@ Requires:       xdg-utils
 %if 0%{?suse_version} || ( 0%{?fedora} && 0%{?fedora} < 25 ) || ( 0%{?rhel} && 0%{?rhel} < 8 )
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
+%if ( 0%{?fedora} && 0%{?fedora} < 24 ) || ( 0%{?rhel} && 0%{?rhel} < 8 )
+Requires(trans):  shared-mime-info
+%endif
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 Group:          Applications/Communications

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


More information about the x2go-commits mailing list