[X2Go-Commits] [x2goclient] 03/04: x2goclient.spec: pull in redhat-rpm-config manually.

[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 09b10cad1acf1011d854b727bc7340daa43b3659
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 31 08:46:47 2018 +0100

    x2goclient.spec: 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.
---
 debian/changelog | 2 ++
 x2goclient.spec  | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1581d92..eb9843f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
   * x2goclient.spec:
     - Build-depend on pkg-config.
     - 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.
 
  -- 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 d47e4a8..53e68fe 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -50,6 +50,14 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkg-config
 %fi
 
+%if 0%{?fedora} || 0%{?rhel}
+# For some reason qt(4)-dev doesn't depend upon redhat-rpm-config,
+# but the GCC spec file is still used, which leads to gcc failing
+# due to a missing annobin plugin during compilation.
+# Let's build-depend upon redhat-rpm-config for now manually.
+BuildRequires:  redhat-rpm-config
+%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