[X2Go-Commits] [x2goclient] 04/04: x2goclient.spec: try to ignore gettext-tools-mini on *SuSE to force installation of the new/renamed gettext-runtime-mini package.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit f1c4da4009628fab44c434f4099dd4a3788e7492
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 31 08:59:35 2018 +0100

    x2goclient.spec: try to ignore gettext-tools-mini on *SuSE to force installation of the new/renamed gettext-runtime-mini package.
---
 debian/changelog | 2 ++
 x2goclient.spec  | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eb9843f..3e7c2d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
     - EPEL packages need to depend upon pkgconfig for now, not pkg-config.
     - Pull in redhat-rpm-config manually. This should probably be done by
       something else, like... gcc or qmake or qt(4)-dev, but it isn't.
+    - Try to ignore gettext-tools-mini on *SuSE to force installation of the
+      new/renamed gettext-runtime-mini package.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 Jun 2018 00:39:28 +0200
 
diff --git a/x2goclient.spec b/x2goclient.spec
index 53e68fe..29aa50e 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -58,6 +58,12 @@ BuildRequires:  pkg-config
 BuildRequires:  redhat-rpm-config
 %endif
 
+%if 0%{?suse_version}
+# gettext-tools-mini were renammed to gettext-runtime-mini, but something
+# wants to still pull in the older package, so ignore it.
+#!BuildIgnore:  gettext-tools-mini
+%endif
+
 %if "%{?_vendor}" == "suse"
 BuildRequires:  fdupes update-desktop-files
 %if 0%{?suse_version} >= 1130

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git