[X2Go-Commits] [x2gomatebindings] 01/01: x2gomatebindings.spec: pull in redhat-rpm-confi, and, as a side-effect, annobin.
git-admin at x2go.org
git-admin at x2go.org
Sat Nov 17 23:08:32 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gomatebindings.
commit d733cd550712d4172eba6f67702a5069cb089909
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Nov 17 23:08:06 2018 +0100
x2gomatebindings.spec: pull in redhat-rpm-confi, and, as a side-effect, annobin.
---
debian/changelog | 1 +
x2gomatebindings.spec | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2a2ea44..98bff3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x2gomatebindings (0.0.1.6-0~x2go1) UNRELEASED; urgency=medium
* New upstream version (0.0.1.6):
* x2gomatebindings.spec:
- x2goagent is dead, long live x2goserver-x2goagent.
+ - Pull in redhat-rpm-confi, and, as a side-effect, annobin.
-- X2Go Release Manager <git-admin at x2go.org> Wed, 23 Aug 2017 10:23:41 +0200
diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec
index 6495ce9..8c7484d 100644
--- a/x2gomatebindings.spec
+++ b/x2gomatebindings.spec
@@ -59,6 +59,14 @@ BuildRequires: gtk2-devel
%endif
%endif
+%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
+
Requires: x2goserver >= 4.0.1.4
Requires: x2goserver-extensions
Requires: zenity
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git
More information about the x2go-commits
mailing list