[X2Go-Commits] [pinentry-x2go] 02/02: pinentry-x2go.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 pinentry-x2go.

commit 8663419e2afa083c11368eab3aa76cafa9d1366c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 11 22:17:32 2018 +0100

    pinentry-x2go.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   | 3 +++
 pinentry-x2go.spec | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 292b832..0125ecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ pinentry-x2go (0.7.5.10-0x2go1) UNRELEASED; urgency=low
     - Uploaders: add myself. Also, force a rebuild due to the changed
       versioning.
     - Add Build-Depends upon qttools5-dev-tools for lrelease.
+  * pinentry-x2go.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.
 
   [ Mike Gabriel ]
   * New upstream version (0.7.5.10):
diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec
index b1f62c0..b2f780d 100644
--- a/pinentry-x2go.spec
+++ b/pinentry-x2go.spec
@@ -24,6 +24,14 @@ BuildRequires:  qt4-devel
 BuildRequires:  qt-devel
 %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
+%endif
+
 %description
 This package contains a program that allows for entry of PINs or pass
 phrases. Based on original pinentry-qt software, modified for

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