diff options
| author | Niels de Vos <ndevos@redhat.com> | 2019-02-25 12:32:21 +0100 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2019-02-26 08:38:53 +0000 |
| commit | 3d7cd3d0f56f31dc8d87e9403f2c734c14de63f9 (patch) | |
| tree | 163f67d9d449a57f0c1e291a0071e583ca5158c5 | |
| parent | 0419d9ab932a2f4f9e734a92df8912be0b51f046 (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.
Backport of commit 30f358bb6b69b8c31da550608a4996a84e8b420b:
> Change-Id: I7bea08202dd59ac309de8bc861da920ed3600bc6
> Fixes: bz#1680587
> Signed-off-by: Niels de Vos <ndevos@redhat.com>
Change-Id: I7bea08202dd59ac309de8bc861da920ed3600bc6
Fixes: bz#1680586
Signed-off-by: Niels de Vos <ndevos@redhat.com>
| -rw-r--r-- | glusterfs.spec.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 205b51d4bbc..a1b6fddcacb 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 |