e7a346
From 77c5fda269bffe16d8564a5d26ed838ad9b6fcea Mon Sep 17 00:00:00 2001
e7a346
From: Jiffin Tony Thottan <jthottan@redhat.com>
e7a346
Date: Tue, 14 Nov 2017 12:43:29 +0530
e7a346
Subject: [PATCH 73/74] Fix build issues related to nfs-ganesha package
e7a346
e7a346
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
e7a346
---
e7a346
 glusterfs.spec.in | 20 +++++++++++++-------
e7a346
 1 file changed, 13 insertions(+), 7 deletions(-)
e7a346
e7a346
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
e7a346
index 05eff07..b6ba91c 100644
e7a346
--- a/glusterfs.spec.in
e7a346
+++ b/glusterfs.spec.in
e7a346
@@ -822,9 +822,6 @@ install -D -p -m 0644 extras/glusterfs-logrotate \
e7a346
 # ganesha ghosts
e7a346
 mkdir -p %{buildroot}%{_sysconfdir}/ganesha
e7a346
 touch %{buildroot}%{_sysconfdir}/ganesha/ganesha-ha.conf
e7a346
-mkdir -p %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/exports
e7a346
-touch %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha.conf
e7a346
-touch %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf
e7a346
 
e7a346
 %if ( 0%{!?_without_georeplication:1} )
e7a346
 mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
e7a346
@@ -888,11 +885,13 @@ modprobe fuse
e7a346
 exit 0
e7a346
 %endif
e7a346
 
e7a346
+%if ( 0%{?_build_server} )
e7a346
 %if ( 0%{?fedora} && 0%{?fedora} > 25 )
e7a346
 %post ganesha
e7a346
 semanage boolean -m ganesha_use_fusefs --on
e7a346
 exit 0
e7a346
 %endif
e7a346
+%endif
e7a346
 
e7a346
 %if ( 0%{?_build_server} )
e7a346
 %if ( 0%{!?_without_georeplication:1} )
e7a346
@@ -1016,11 +1015,13 @@ fi
e7a346
 %postun api
e7a346
 /sbin/ldconfig
e7a346
 
e7a346
+%if ( 0%{?_build_server} )
e7a346
 %if ( 0%{?fedora} && 0%{?fedora} > 25 )
e7a346
 %postun ganesha
e7a346
 semanage boolean -m ganesha_use_fusefs --off
e7a346
 exit 0
e7a346
 %endif
e7a346
+%endif
e7a346
 
e7a346
 %postun libs
e7a346
 /sbin/ldconfig
e7a346
@@ -1037,20 +1038,24 @@ exit 0
e7a346
 ##-----------------------------------------------------------------------------
e7a346
 ## All %%trigger should be placed here and keep them sorted
e7a346
 ##
e7a346
+%if ( 0%{?_build_server} )
e7a346
 %if ( 0%{?fedora} && 0%{?fedora} > 25 )
e7a346
 %trigger ganesha -- selinux-policy-targeted
e7a346
 semanage boolean -m ganesha_use_fusefs --on
e7a346
 exit 0
e7a346
 %endif
e7a346
+%endif
e7a346
 
e7a346
 ##-----------------------------------------------------------------------------
e7a346
 ## All %%triggerun should be placed here and keep them sorted
e7a346
 ##
e7a346
+%if ( 0%{?_build_server} )
e7a346
 %if ( 0%{?fedora} && 0%{?fedora} > 25 )
e7a346
 %triggerun ganesha -- selinux-policy-targeted
e7a346
 semanage boolean -m ganesha_use_fusefs --off
e7a346
 exit 0
e7a346
 %endif
e7a346
+%endif
e7a346
 
e7a346
 ##-----------------------------------------------------------------------------
e7a346
 ## All %%files should be placed here and keep them grouped
e7a346
@@ -1074,6 +1079,11 @@ exit 0
e7a346
 %if ( ! 0%{?_build_server} )
e7a346
 # exclude ganesha files
e7a346
 %exclude %{_prefix}/lib/ocf/*
e7a346
+%exclude %{_libexecdir}/ganesha/*
e7a346
+%exclude %{_prefix}/lib/ocf/resource.d/heartbeat/*
e7a346
+%exclude %{_sysconfdir}/ganesha/ganesha-ha.conf.sample
e7a346
+%exclude %{_sysconfdir}/ganesha/ganesha-ha.conf
e7a346
+
e7a346
 # exclude incrementalapi
e7a346
 %exclude %{_libexecdir}/glusterfs/*
e7a346
 %exclude %{_sbindir}/gfind_missing_files
e7a346
@@ -1323,10 +1333,6 @@ exit 0
e7a346
 %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh
e7a346
 %{_sysconfdir}/ganesha/ganesha-ha.conf.sample
e7a346
 %ghost %config(noreplace) %{_sysconfdir}/ganesha/ganesha-ha.conf
e7a346
-%ghost %dir %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha
e7a346
-%ghost %dir %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/exports
e7a346
-%ghost %config(noreplace) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha.conf
e7a346
-%ghost %config(noreplace) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf
e7a346
 %endif
e7a346
 
e7a346
 %if ( 0%{?_build_server} )
e7a346
-- 
e7a346
1.8.3.1
e7a346