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