From 244decb1cc6091d441a58bcc5f9f7f85291a2f09 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Thu, 30 Jun 2016 11:53:51 -0400 Subject: 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 > 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: 1351711 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/14837 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos Smoke: Gluster Build System --- glusterfs.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 39b6cb01c71..1943411d64d 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 -- cgit