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