[X2Go-Commits] [x2goserver] 01/01: rpmlint requires shared-mime-info at build time on SLE <= 11.3.

git-admin at x2go.org git-admin at x2go.org
Fri Jan 30 07:38:36 CET 2015


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

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 68e8c94d44f3efc19bf8ee7d7a241575f55453ac
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 30 07:38:12 2015 +0100

    rpmlint requires shared-mime-info at build time on SLE <= 11.3.
---
 debian/changelog |    2 +-
 x2goserver.spec  |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7196b07..a0bc8d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -104,7 +104,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     + BuildRequires: SUSE <= 11.3 has xorg-x11, not xinit.
     + Requires (x2goserver-xsession): SUSE <= 11.3 has xorg-x11, not xinit.
     + No Bashisms in scriptlets.
-    + rpmlint requires xdg-utils at build time.
+    + rpmlint requires shared-mime-info at build time on SLE <= 11.3.
 
   [ Matthew L. Dailey ]
   * New upstream version (4.0.1.19):
diff --git a/x2goserver.spec b/x2goserver.spec
index cfe9c72..593f976 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -25,7 +25,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %endif
 
 BuildRequires:  findutils
-BuildRequires:  xdg-utils
+
+%if 0%{?suse_version} || 0%{?suse_version} <= 1130
+BuildRequires: shared-mime-info
+%endif
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  perl(ExtUtils::MakeMaker)
 
@@ -254,6 +258,9 @@ Group:          Productivity/Networking/Remote Desktop
 %package fmbindings
 Summary:        X2Go Server (file manager bindings)
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?suse_version} || 0%{?suse_version} <= 1130
+PreReq: shared-mime-info
+%endif
 Requires:       xdg-utils
 Requires:       desktop-file-utils
 Requires(post):   desktop-file-utils

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


More information about the x2go-commits mailing list