[X2Go-Commits] [x2goadmincenter] 01/01: x2goadmincenter.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.

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

commit c0e68daa196856b02acf14f0ae6740ea73c12f28
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 3 07:18:48 2018 +0100

    x2goadmincenter.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 ++
 x2goadmincenter.spec | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 763c85a..9a3ab51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,5 +86,7 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low
   * x2goadmincenter.spec:
     - Honor %{optflags} for CXXFLAGS and don't strip binaries. Backported from
       X2Go Client.
+    - 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.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 21 Sep 2011 21:12:56 +0200
diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec
index 77ff25f..26629f5 100644
--- a/x2goadmincenter.spec
+++ b/x2goadmincenter.spec
@@ -31,12 +31,18 @@ BuildRequires:  qt-devel
 %endif
 %endif
 %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
 %if 0%{?el6}
 BuildRequires:  man
 %else
 BuildRequires:  man2html-core
 %endif
 %endif
+
 Requires:       hicolor-icon-theme
 
 %if 0%{?el5}

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