[X2Go-Commits] [x2gobroker] 05/06: x2gobroker.spec: pull in gcc and redhat-rpm-config.

git-admin at x2go.org git-admin at x2go.org
Tue Nov 13 04:35:56 CET 2018


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit 25ab69a8735642207eb3dbde5a0475eed8db2883
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Nov 13 04:32:39 2018 +0100

    x2gobroker.spec: pull in gcc and redhat-rpm-config.
---
 debian/changelog |  1 +
 x2gobroker.spec  | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 58e64d3..6a7e31d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -125,6 +125,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium
     - Remove obsolete EPEL 5 support.
     - Switch to HTTPS-based links.
     - Use more curly braces.
+    - Pull in gcc and redhat-rpm-config.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Wed, 05 Apr 2017 20:01:48 +0000
 
diff --git a/x2gobroker.spec b/x2gobroker.spec
index 2adf99a..f0ea2d0 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -57,6 +57,16 @@ Requires(pre):  pwdutils
 Requires(pre):  shadow-utils
 %endif
 
+BuildRequires:  gcc
+
+%if 0%{?fedora} || 0%{?rhel}
+# For some reason gcc 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 ( ! 0%{?suse_version} ) || ( 0%{?suse_version} <= 1500 )
 # We cannot generate debug info since this is a collection of python and shell scripts.
 # Making the package noarch isn't possible since we use arch-dependent paths to install

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


More information about the x2go-commits mailing list