50dc83
From 1f28e008825ae291208a9e6c714dd642f715a2a1 Mon Sep 17 00:00:00 2001
e7a346
From: "Bala.FA" <barumuga@redhat.com>
e7a346
Date: Mon, 7 Apr 2014 15:24:10 +0530
50dc83
Subject: [PATCH 06/52] build: remove ghost directory entries
e7a346
e7a346
ovirt requires hook directories for gluster management and ghost
e7a346
directories are no more ghost entries
e7a346
e7a346
Label: DOWNSTREAM ONLY
e7a346
e7a346
Change-Id: Iaf1066ba0655619024f87eaaa039f0010578c567
e7a346
Signed-off-by: Bala.FA <barumuga@redhat.com>
e7a346
Reviewed-on: https://code.engineering.redhat.com/gerrit/60133
e7a346
Tested-by: Milind Changire <mchangir@redhat.com>
e7a346
---
50dc83
 glusterfs.spec.in | 19 +++++++++++++++++--
50dc83
 1 file changed, 17 insertions(+), 2 deletions(-)
e7a346
e7a346
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
50dc83
index f5c1f79..6be492e 100644
e7a346
--- a/glusterfs.spec.in
e7a346
+++ b/glusterfs.spec.in
50dc83
@@ -799,15 +799,30 @@ install -D -p -m 0644 extras/glusterfs-logrotate \
e7a346
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
e7a346
 
e7a346
 %if ( 0%{!?_without_georeplication:1} )
e7a346
-# geo-rep ghosts
e7a346
 mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
e7a346
 touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
e7a346
 install -D -p -m 0644 extras/glusterfs-georep-logrotate \
e7a346
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep
e7a346
 %endif
e7a346
 
e7a346
+%if ( 0%{!?_without_syslog:1} )
e7a346
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
e7a346
+install -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \
e7a346
+    %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
e7a346
+%endif
e7a346
+
e7a346
+%if ( 0%{?rhel} && 0%{?rhel} == 6 )
e7a346
+install -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \
e7a346
+    %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
e7a346
+%endif
e7a346
+
e7a346
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
e7a346
+install -D -p -m 0644 extras/logger.conf.example \
e7a346
+    %{buildroot}%{_sysconfdir}/glusterfs/logger.conf.example
e7a346
+%endif
e7a346
+%endif
e7a346
+
50dc83
 %if ( 0%{!?_without_server:1} )
50dc83
-# the rest of the ghosts
e7a346
 touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
e7a346
 touch %{buildroot}%{_sharedstatedir}/glusterd/options
e7a346
 subdirs=(add-brick create copy-file delete gsync-create remove-brick reset set start stop)
e7a346
-- 
e7a346
1.8.3.1
e7a346