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