From f1d10db3bf315bfc9640a532aa39b9248d55e9c6 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Thu, 13 Dec 2018 11:24:05 +0530 Subject: [PATCH 463/493] 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'. mainline: > Change-Id: I902f47e3c589526c774d0aceb6fc2815abf86b01 > BUG: 1350793 > Signed-off-by: Kaleb S KEITHLEY > Reviewed-on: http://review.gluster.org/14823 > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > NetBSD-regression: NetBSD Build System > Reviewed-by: Milind Changire > Reviewed-by: Niels de Vos Change-Id: I902f47e3c589526c774d0aceb6fc2815abf86b01 BUG: 1350745 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: https://code.engineering.redhat.com/gerrit/158502 Tested-by: RHGS Build Bot Tested-by: Milind Changire Reviewed-by: Sunil Kumar Heggodu Gopala Acharya --- glusterfs.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index b6b7630..2745b50 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1168,7 +1168,7 @@ exit 0 %exclude %{_tmpfilesdir}/gluster.conf %endif %if ( 0%{?_with_firewalld:1} ) -%exclude /usr/lib/firewalld/services/glusterfs.xml +%exclude %{_prefix}/lib/firewalld/services/glusterfs.xml %endif %endif %doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README.md THANKS -- 1.8.3.1