diff options
| -rw-r--r-- | cli/src/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | glusterfs.spec.in | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 6be070f6ff7..3e7511fe1b7 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -1,6 +1,4 @@ -if WITH_SERVER sbin_PROGRAMS = gluster -endif gluster_SOURCES = cli.c registry.c input.c cli-cmd.c cli-rl.c cli-cmd-global.c \ cli-cmd-volume.c cli-cmd-peer.c cli-rpc-ops.c cli-cmd-parser.c\ diff --git a/doc/Makefile.am b/doc/Makefile.am index 7c04d74019a..de68c20b4d7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,9 +1,9 @@ EXTRA_DIST = glusterfs.8 mount.glusterfs.8 gluster.8 \ glusterd.8 glusterfsd.8 -man8_MANS = glusterfs.8 mount.glusterfs.8 +man8_MANS = glusterfs.8 mount.glusterfs.8 gluster.8 if WITH_SERVER -man8_MANS += gluster.8 glusterd.8 glusterfsd.8 +man8_MANS += glusterd.8 glusterfsd.8 endif CLEANFILES = diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 8c58ec73e82..e815137b8d7 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -348,7 +348,6 @@ is in user space and easily manageable. This package provides the api include files. -%if ( 0%{!?_without_server:1} ) %package cli Summary: GlusterFS CLI Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -363,7 +362,6 @@ called Translators from GNU Hurd kernel. Much of the code in GlusterFS is in user space and easily manageable. This package provides the GlusterFS CLI application and its man page -%endif %package cloudsync-plugins Summary: Cloudsync Plugins @@ -835,10 +833,8 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs ## Install bash completion for cli -%if ( 0%{!?_without_server:1} ) install -p -m 0744 -D extras/command-completion/gluster.bash \ %{buildroot}%{_sysconfdir}/bash_completion.d/gluster -%endif %clean rm -rf %{buildroot} @@ -1098,12 +1094,10 @@ exit 0 %dir %{_includedir}/glusterfs/api %{_includedir}/glusterfs/api/* -%if ( 0%{!?_without_server:1} ) %files cli %{_sbindir}/gluster %{_mandir}/man8/gluster.8* %{_sysconfdir}/bash_completion.d/gluster -%endif %files cloudsync-plugins %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins @@ -1414,6 +1408,9 @@ exit 0 %endif %changelog +* Fri Jun 14 2019 Niels de Vos <ndevos@redhat.com> +- always build glusterfs-cli to allow monitoring/managing from clients + * Wed Mar 6 2019 Kaleb S. KEITHLEY <kkeithle@redhat.com> - remove unneeded ldconfig in scriptlets - reported by Igor Gnatenko in Fedora |