[X2Go-Commits] [x2goplasmabindings] 01/02: x2goplasmabindings.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:11:19 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goplasmabindings.
commit bf16dfd4e5c8e93d17279ed12781415d45cb3cd5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Nov 17 23:10:01 2018 +0100
x2goplasmabindings.spec: pull in redhat-rpm-confi, and, as a side-effect, annobin.
---
debian/changelog | 2 ++
x2goplasmabindings.spec | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 87ff0e5..d4ab4e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ x2goplasmabindings (3.0.2.2-0x2go1) UNRELEASED; urgency=low
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
versioning.
+ * x2goplasmabindings.spec:
+ - Pull in redhat-rpm-confi, and, as a side-effect, annobin.
-- X2Go Release Manager <git-admin at x2go.org> Tue, 10 Feb 2015 23:38:16 +0100
diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec
index f0d50a1..3132079 100644
--- a/x2goplasmabindings.spec
+++ b/x2goplasmabindings.spec
@@ -24,6 +24,14 @@ BuildRequires: kdelibs4-devel
BuildRequires: intltool
Requires: plasma-addons-x2go
+%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%{?el5}
# For compatibility with EPEL5
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
More information about the x2go-commits
mailing list