summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2016-06-30 11:53:51 -0400
committerNiels de Vos <ndevos@redhat.com>2016-07-07 03:57:12 -0700
commit244decb1cc6091d441a58bcc5f9f7f85291a2f09 (patch)
tree2afab3be064706fec42e2973e429c053dbe98593
parent01fed48b5b096bc22069003190377f45cca2176f (diff)
build: glusterfs.spec(.in) firewalld file doesn't use %{_prefix}
.../firewalld/services/glusterfs.xml in %server files section does not use %{_prefix} Other firewalld files, e.g., in the firewalld.src.rpm file use %{_prefix} N.B. the other 'hardcoded' path, "/sbin/mount.glusterfs" in the %files fuse section must remain as is, there is no macro for mount utilities to use as there is for, e.g., the %{_sbindir} macro for /usr/sbin. This doesn't matter for either RHEL6, where /sbin and /usr/sbin are distinct directories, or for Fedora and RHEL7, where /sbin is a symlink to /usr/sbin. E.g. see the nfs- utils.src.rpm where /sbin/mount.nfs is also 'hardcoded' Backport of commit c4ddfa5b76690db66fb22518d12226e2bf9cb236: > Change-Id: I902f47e3c589526c774d0aceb6fc2815abf86b01 > BUG: 1350793 > Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> > Reviewed-on: http://review.gluster.org/14823 > Smoke: Gluster Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > Reviewed-by: Milind Changire <mchangir@redhat.com> > Reviewed-by: Niels de Vos <ndevos@redhat.com> Change-Id: I902f47e3c589526c774d0aceb6fc2815abf86b01 BUG: 1351711 Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/14837 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Niels de Vos <ndevos@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.org>
-rw-r--r--glusterfs.spec.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 39b6cb0..1943411 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -1180,7 +1180,7 @@ exit 0
%{_libexecdir}/glusterfs/peer_add_secret_pub
%if ( 0%{?_with_firewalld:1} )
-/usr/lib/firewalld/services/glusterfs.xml
+%{_prefix}/lib/firewalld/services/glusterfs.xml
%endif
%changelog