This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit c634311fb5eb1347ecfd43562253dfb3b61cb819 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 27 04:56:53 2018 +0200 x2goserver.spec: work around build failure on Fedora Rawhide/29+ by pulling annobin in explicitly. Shouldn't be necessary, but the current architecture around redhat-rpm-config requires that. --- debian/changelog | 3 +++ x2goserver.spec | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0c72d85..c5094c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -159,6 +159,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Backport dangling symlink check for /etc/x2go/applications. + Pull in GCC as a build dependency. + Mask out variables in comments to avoid build-time warning messages. + + Work around build failure on Fedora Rawhide/29+ by pulling annobin in + explicitly. Shouldn't be necessary, but the current architecture around + redhat-rpm-config requires that. * debian/copyright.in: + Remove reference to rgb file. + Remove reference to x2goagent wrapper script. diff --git a/x2goserver.spec b/x2goserver.spec index beb7db2..7fa5b0d 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -27,6 +27,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # Fedora 29+ doesn't install gcc and g++ automatically any longer, # but this dependency should be useful for all distros really. BuildRequires: gcc +%if 0%{?fedora} > 28 +# The annobin plugin is enabled by default and redhat-rpm-config depends +# on it... if the gcc package is installed. +# Since Fedora 29+ removed gcc as a common package pulled in when +# generating the build chroot, redhat-rpm-config is not pulling annobin +# in. +# If we later install the gcc package, the rich/boolean dependency within +# redhat-rpm-config doesn't seem to be re-evaluated, so we're left with a +# mess. +# Explicitly depend upon annobin, at least for now. +BuildRequires: annobin +%endif BuildRequires: findutils -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git