[X2Go-Commits] [x2gokdrive] 01/04: x2gokdrive.spec: rework gettext-autopoint build dependency.

[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 x2gokdrive.

commit 24e87c90b29462fa1935a4f5433b52c278150036
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 28 21:03:05 2019 +0100

    x2gokdrive.spec: rework gettext-autopoint build dependency.
    
    *SuSE uses gettext-tools (which provides a virtual gettext-devel
    package), while RHEL-land has a "real" gettext-devel package that
    virtually provides a gettext-autopoint package.
---
 debian/changelog | 4 ++++
 x2gokdrive.spec  | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e7688e..b2f4fb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,10 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       forgiving and always ships the turbo variant, but sets the virtual
       provide to pkgconfig(libjpeg) (yes, for all versions down to RHEL 6,
       albit via the updates repository!) and do not mention "turbo" in there.
+    + Rework gettext-autopoint build dependency. *SuSE uses gettext-tools
+      (which provides a virtual gettext-devel package), while RHEL-land has a
+      "real" gettext-devel package that virtually provides a gettext-autopoint
+      package.
   * debian/rules:
     + Remove weird empty variable reference construct.
     + Whitespace-only fixes.
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index e19f28d..e575d97 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -72,7 +72,16 @@ BuildRequires:  automake
 BuildRequires:  autoconf
 BuildRequires:  libtool
 BuildRequires:  gettext
+%if 0%{?suse_version}
+BuildRequires:  gettext-tools
+%else
+# This is really just a virtual provides for gettext-devel.
+# We might want to spell it out directly and only once, also for *SuSE, but
+# then we would be pulling in a "real" package on non-*SuSE, but a virtual
+# one on *SuSE, since *SuSE only has gettext-{runtime,tools} as "real" packages
+# with gettext-tools providing the virtual gettext-devel package.
 BuildRequires:  gettext-autopoint
+%endif
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  imake

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