3604df
From f8e9d2f1a5b1c06dea5ded48a296115f59c656bd Mon Sep 17 00:00:00 2001
12a457
From: Milind Changire <mchangir@redhat.com>
12a457
Date: Tue, 22 Mar 2016 23:33:13 +0530
3604df
Subject: [PATCH 18/86] build: spec file conflict resolution
12a457
12a457
Missed conflict resolution for removing references to
12a457
gluster.conf.example as mentioned in patch titled:
12a457
packaging: gratuitous dependencies on rsyslog-mm{count,jsonparse}
12a457
by Kaleb
12a457
12a457
References to hook scripts S31ganesha-start.sh and
12a457
S31ganesha-reset.sh got lost in the downstream only
12a457
patch conflict resolution.
12a457
12a457
Commented blanket reference to %{_sharedsstatedir}/glusterd/*
12a457
in section %files server to avoid rpmbuild warning related to
12a457
multiple references to hook scripts and other files under
12a457
/var/lib/glusterd.
12a457
12a457
Label: DOWNSTREAM ONLY
12a457
12a457
Change-Id: I9d409f1595ab985ed9f79d9d4f4298877609ba17
12a457
Signed-off-by: Milind Changire <mchangir@redhat.com>
12a457
Reviewed-on: https://code.engineering.redhat.com/gerrit/70535
12a457
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
12a457
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
12a457
---
3604df
 glusterfs.spec.in |   17 -----------------
3604df
 1 files changed, 0 insertions(+), 17 deletions(-)
12a457
12a457
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
3604df
index d5de0f2..cd24298 100644
12a457
--- a/glusterfs.spec.in
12a457
+++ b/glusterfs.spec.in
3604df
@@ -740,23 +740,6 @@ install -D -p -m 0644 extras/glusterfs-georep-logrotate \
12a457
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep
12a457
 %endif
12a457
 
12a457
-%if ( 0%{!?_without_syslog:1} )
12a457
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
12a457
-install -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \
12a457
-    %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
12a457
-%endif
12a457
-
12a457
-%if ( 0%{?rhel} && 0%{?rhel} == 6 )
12a457
-install -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \
12a457
-    %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
12a457
-%endif
12a457
-
12a457
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
12a457
-install -D -p -m 0644 extras/logger.conf.example \
12a457
-    %{buildroot}%{_sysconfdir}/glusterfs/logger.conf.example
12a457
-%endif
12a457
-%endif
12a457
-
12a457
 touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
12a457
 touch %{buildroot}%{_sharedstatedir}/glusterd/options
3604df
 subdirs=(add-brick create copy-file delete gsync-create remove-brick reset set start stop)
12a457
-- 
12a457
1.7.1
12a457