This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit b7f8c6bd811101ee40e8efae0abb422ae5938515 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 3 07:33:08 2018 +0100 x2godesktopsharing.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 | 6 +++++- x2godesktopsharing.spec | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9e07e77..d13adf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mihai Moldovan ] + * New upstream version (3.1.1.5): + * x2godesktopsharing.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. -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index b6a0149..38475b8 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -34,6 +34,14 @@ 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 +%endif + Requires: hicolor-icon-theme Requires: x2goserver >= 4.0.0.0 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git