14f8ab
From 40eb62a8872ce061416e899fb6c0784b6253ab16 Mon Sep 17 00:00:00 2001
14f8ab
From: Niels de Vos <ndevos@redhat.com>
14f8ab
Date: Fri, 7 Dec 2018 14:05:21 +0530
14f8ab
Subject: [PATCH 11/52] rpm: glusterfs-devel for client-builds should not
14f8ab
 depend on -server
14f8ab
14f8ab
glusterfs-devel for client-side packages should *not* include the
14f8ab
libgfdb.so symlink and libgfdb.pc file or any of the libchangelog
14f8ab
ones.
14f8ab
14f8ab
Label: DOWNSTREAM ONLY
14f8ab
14f8ab
Change-Id: Ifb4a9cf48841e5af5dd0a98b6de51e2ee469fc56
14f8ab
Signed-off-by: Niels de Vos <ndevos@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/51019
14f8ab
Reviewed-by: Balamurugan Arumugam <barumuga@redhat.com>
14f8ab
Tested-by: Balamurugan Arumugam <barumuga@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/60139
14f8ab
Tested-by: Milind Changire <mchangir@redhat.com>
14f8ab
---
14f8ab
 glusterfs.spec.in | 86 +++++++++++++++++++++++++++++++++++++++----------------
14f8ab
 1 file changed, 62 insertions(+), 24 deletions(-)
14f8ab
14f8ab
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
14f8ab
index b70dbfc..1c631db 100644
14f8ab
--- a/glusterfs.spec.in
14f8ab
+++ b/glusterfs.spec.in
14f8ab
@@ -450,30 +450,6 @@ is in user space and easily manageable.
14f8ab
 This package provides support to FUSE based clients and inlcudes the
14f8ab
 glusterfs(d) binary.
14f8ab
 
14f8ab
-%if ( 0%{!?_without_server:1} )
14f8ab
-%package ganesha
14f8ab
-Summary:          NFS-Ganesha configuration
14f8ab
-Group:            Applications/File
14f8ab
-
14f8ab
-Requires:         %{name}-server%{?_isa} = %{version}-%{release}
14f8ab
-Requires:         nfs-ganesha-gluster, pcs, dbus
14f8ab
-%if ( 0%{?rhel} && 0%{?rhel} == 6 )
14f8ab
-Requires:         cman, pacemaker, corosync
14f8ab
-%endif
14f8ab
-
14f8ab
-%description ganesha
14f8ab
-GlusterFS is a distributed file-system capable of scaling to several
14f8ab
-petabytes. It aggregates various storage bricks over Infiniband RDMA
14f8ab
-or TCP/IP interconnect into one large parallel network file
14f8ab
-system. GlusterFS is one of the most sophisticated file systems in
14f8ab
-terms of features and extensibility.  It borrows a powerful concept
14f8ab
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
14f8ab
-is in user space and easily manageable.
14f8ab
-
14f8ab
-This package provides the configuration and related files for using
14f8ab
-NFS-Ganesha as the NFS server using GlusterFS
14f8ab
-%endif
14f8ab
-
14f8ab
 %if ( 0%{!?_without_georeplication:1} )
14f8ab
 %package geo-replication
14f8ab
 Summary:          GlusterFS Geo-replication
14f8ab
@@ -1157,6 +1133,62 @@ exit 0
14f8ab
 %exclude %{_datadir}/glusterfs/run-tests.sh
14f8ab
 %exclude %{_datadir}/glusterfs/tests
14f8ab
 %endif
14f8ab
+%if 0%{?_without_server:1}
14f8ab
+%exclude %{_sysconfdir}/glusterfs/gluster-rsyslog-5.8.conf
14f8ab
+%exclude %{_sysconfdir}/glusterfs/gluster-rsyslog-7.2.conf
14f8ab
+%exclude %{_sysconfdir}/glusterfs/glusterd.vol
14f8ab
+%exclude %{_sysconfdir}/glusterfs/glusterfs-georep-logrotate
14f8ab
+%exclude %{_sysconfdir}/glusterfs/glusterfs-logrotate
14f8ab
+%exclude %{_sysconfdir}/glusterfs/group-db-workload
14f8ab
+%exclude %{_sysconfdir}/glusterfs/group-distributed-virt
14f8ab
+%exclude %{_sysconfdir}/glusterfs/group-gluster-block
14f8ab
+%exclude %{_sysconfdir}/glusterfs/group-metadata-cache
14f8ab
+%exclude %{_sysconfdir}/glusterfs/group-nl-cache
14f8ab
+%exclude %{_sysconfdir}/glusterfs/group-virt.example
14f8ab
+%exclude %{_sysconfdir}/glusterfs/logger.conf.example
14f8ab
+%exclude %{_sysconfdir}/rsyslog.d/gluster.conf.example
14f8ab
+%exclude %{_prefix}/bin/glusterfind
14f8ab
+%exclude %{_prefix}/lib/firewalld/services/glusterfs.xml
14f8ab
+%exclude %{_prefix}/lib/systemd/system/glusterd.service
14f8ab
+%exclude %{_prefix}/lib/systemd/system/glusterfssharedstorage.service
14f8ab
+%exclude %{_prefix}/lib/tmpfiles.d/gluster.conf
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix-locks.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quotad.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/sdfs.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/selinux.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/thin-arbiter.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt/glusterd.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so
14f8ab
+%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so
14f8ab
+%exclude %{_libexecdir}/glusterfs/*
14f8ab
+%exclude %{_sbindir}/conf.py
14f8ab
+%exclude %{_sbindir}/gcron.py
14f8ab
+%exclude %{_sbindir}/gf_attach
14f8ab
+%exclude %{_sbindir}/gfind_missing_files
14f8ab
+%exclude %{_sbindir}/glfsheal
14f8ab
+%exclude %{_sbindir}/gluster
14f8ab
+%exclude %{_sbindir}/gluster-setgfid2path
14f8ab
+%exclude %{_sbindir}/glusterd
14f8ab
+%exclude %{_sbindir}/snap_scheduler.py
14f8ab
+%exclude %{_datadir}/glusterfs/scripts/control-cpu-load.sh
14f8ab
+%exclude %{_datadir}/glusterfs/scripts/control-mem.sh
14f8ab
+%exclude %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
14f8ab
+%exclude %{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh
14f8ab
+%exclude %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
14f8ab
+%exclude %{_sharedstatedir}/glusterd/*
14f8ab
+%endif
14f8ab
 
14f8ab
 %files api
14f8ab
 %exclude %{_libdir}/*.so
14f8ab
@@ -1190,7 +1222,13 @@ exit 0
14f8ab
 %exclude %{_includedir}/glusterfs/api
14f8ab
 %exclude %{_libdir}/libgfapi.so
14f8ab
 %{_libdir}/*.so
14f8ab
+%if ( 0%{?_without_server:1} )
14f8ab
+%exclude %{_libdir}/pkgconfig/libgfchangelog.pc
14f8ab
+%exclude %{_libdir}/libgfchangelog.so
14f8ab
+%else
14f8ab
 %{_libdir}/pkgconfig/libgfchangelog.pc
14f8ab
+%{_libdir}/libgfchangelog.so
14f8ab
+%endif
14f8ab
 
14f8ab
 %files client-xlators
14f8ab
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab