summaryrefslogtreecommitdiffstats
path: root/glusterfs.spec.in
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2019-02-25 12:32:21 +0100
committerAmar Tumballi <amarts@redhat.com>2019-02-26 07:18:46 +0000
commit30f358bb6b69b8c31da550608a4996a84e8b420b (patch)
treeb33824e5204b8caa451968004fa2f064e2ce7bb0 /glusterfs.spec.in
parent5feeed24f1e1fe2891e1418df23bacf0cfb991e6 (diff)
build: do not install service related files when building --without-server
It seems that glusterfs-6 disables building the server (./configure --without-server) on el6 and hence the installed but unpackaged files should not get installed in the first place. Change-Id: I7bea08202dd59ac309de8bc861da920ed3600bc6 Fixes: bz#1680587 Signed-off-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
-rw-r--r--glusterfs.spec.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 1d6dd99..a2d1cdb 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -727,13 +727,13 @@ make check
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
+%if ( 0%{!?_without_server:1} )
%if ( 0%{_for_fedora_koji_builds} )
install -D -p -m 0644 %{SOURCE1} \
%{buildroot}%{_sysconfdir}/sysconfig/glusterd
install -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
%else
-%if ( 0%{!?_without_server:1} )
install -D -p -m 0644 extras/glusterd-sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/glusterd
%endif
@@ -781,9 +781,11 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
%endif
# Install glusterfsd .service or init.d file
+%if ( 0%{!?_without_server:1} )
%if ( 0%{_for_fedora_koji_builds} )
%service_install glusterfsd %{glusterfsd_svcfile}
%endif
+%endif
install -D -p -m 0644 extras/glusterfs-logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs