diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-04-20 09:46:46 -0400 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-04-22 10:53:18 +0000 |
| commit | 05d9c5a3d684512e97327c8d73988ef7f29e1511 (patch) | |
| tree | b74f2b203e0934041d0f990b65c4d1afef225bab | |
| parent | 1e2f13fa89a5aef64cc9e5a229216820ed6e7556 (diff) | |
packaging: no firewalld-filesystem before el7.3
Attempting to build on RHEL or CentOS 7.2 will fail because there is
no firewalld-filesystem RPM. (This probably holds true for older versions
of Fedora too, although the versions where this would apply are so old
and so far gone as to be (nearly) meaningless.
The firewalld rpm in 7.3 has a Requires: firewalld-filesystem.
In addition to other things, the firewalld-filesystem rpm provides rpm
build time macros (a strange place for them actually, there ought to be
a firewalld-devel subpackage instead).
Florian Festi, one of the Fedora RPM/YUM/DNF devs, strongly suggests
that even in 7.3 the correct way to get firewalld-filesystem is to use
BuildRequires: firewalld.
N.B. That someone might try to install 7.3-built RPMs on their 7.2 system
is beside the point.
Change-Id: Iac8cc74a3345acaaed45af4c14e141b7a1711f84
BUG: 1443959
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/17094
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | glusterfs.spec.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 856d3f8f615..153858c2abe 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -233,7 +233,7 @@ BuildRequires: libattr-devel %endif %if (0%{?_with_firewalld:1}) -BuildRequires: firewalld-filesystem +BuildRequires: firewalld %endif Obsoletes: hekafs @@ -540,8 +540,12 @@ Requires(postun): /sbin/service %endif %if (0%{?_with_firewalld:1}) # we install firewalld rules, so we need to have the directory owned +%if ( 0%{!?rhel} ) +# not on RHEL because firewalld-filesystem appeared in 7.3 +# when EL7 rpm gets weak dependencies we can add a Suggests: Requires: firewalld-filesystem %endif +%endif %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) Requires: rpcbind %else @@ -1257,6 +1261,9 @@ exit 0 %endif %changelog +* Thu Apr 20 2017 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- firewalld-filesystem -> firewalld (#1443959) + * Thu Apr 13 2017 Niels de Vos <ndevos@redhat.com> - the -regression-tests sub-package needs "bc" for some tests (#1442145) |