|
 |
256ebe |
From f76d2370160c50a1f59d08a03a444254c289da60 Mon Sep 17 00:00:00 2001
|
|
|
256ebe |
From: Milind Changire <mchangir@redhat.com>
|
|
|
256ebe |
Date: Fri, 7 Dec 2018 16:18:07 +0530
|
|
|
256ebe |
Subject: [PATCH 14/52] build: spec file conflict resolution
|
|
|
256ebe |
|
|
|
256ebe |
Missed conflict resolution for removing references to
|
|
|
256ebe |
gluster.conf.example as mentioned in patch titled:
|
|
|
256ebe |
packaging: gratuitous dependencies on rsyslog-mm{count,jsonparse}
|
|
|
256ebe |
by Kaleb
|
|
|
256ebe |
|
|
|
256ebe |
References to hook scripts S31ganesha-start.sh and
|
|
|
256ebe |
S31ganesha-reset.sh got lost in the downstream only
|
|
|
256ebe |
patch conflict resolution.
|
|
|
256ebe |
|
|
|
256ebe |
Commented blanket reference to %{_sharedsstatedir}/glusterd/*
|
|
|
256ebe |
in section %files server to avoid rpmbuild warning related to
|
|
|
256ebe |
multiple references to hook scripts and other files under
|
|
|
256ebe |
/var/lib/glusterd.
|
|
|
256ebe |
|
|
|
256ebe |
Label: DOWNSTREAM ONLY
|
|
|
256ebe |
|
|
|
256ebe |
Change-Id: I9d409f1595ab985ed9f79d9d4f4298877609ba17
|
|
|
256ebe |
Signed-off-by: Milind Changire <mchangir@redhat.com>
|
|
|
256ebe |
Reviewed-on: https://code.engineering.redhat.com/gerrit/70535
|
|
|
256ebe |
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
256ebe |
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
256ebe |
---
|
|
|
256ebe |
glusterfs.spec.in | 21 +--------------------
|
|
|
256ebe |
1 file changed, 1 insertion(+), 20 deletions(-)
|
|
|
256ebe |
|
|
|
256ebe |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
256ebe |
index a1ff6e0..8c57f57 100644
|
|
|
256ebe |
--- a/glusterfs.spec.in
|
|
|
256ebe |
+++ b/glusterfs.spec.in
|
|
|
256ebe |
@@ -96,9 +96,7 @@
|
|
|
256ebe |
|
|
|
256ebe |
# disable server components forcefully as rhel <= 6
|
|
|
256ebe |
%if ( 0%{?rhel} )
|
|
|
256ebe |
-%if ( "%{?dist}" == ".el6rhs" ) || ( "%{?dist}" == ".el7rhs" ) || ( "%{?dist}" == ".el7rhgs" )
|
|
|
256ebe |
-%global _without_server %{nil}
|
|
|
256ebe |
-%else
|
|
|
256ebe |
+%if (!(( "%{?dist}" == ".el6rhs" ) || ( "%{?dist}" == ".el7rhs" ) || ( "%{?dist}" == ".el7rhgs" )))
|
|
|
256ebe |
%global _without_server --without-server
|
|
|
256ebe |
%endif
|
|
|
256ebe |
%endif
|
|
|
256ebe |
@@ -836,23 +834,6 @@ install -D -p -m 0644 extras/glusterfs-georep-logrotate \
|
|
|
256ebe |
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep
|
|
|
256ebe |
%endif
|
|
|
256ebe |
|
|
|
256ebe |
-%if ( 0%{!?_without_syslog:1} )
|
|
|
256ebe |
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
|
|
|
256ebe |
-install -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \
|
|
|
256ebe |
- %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
|
|
256ebe |
-%endif
|
|
|
256ebe |
-
|
|
|
256ebe |
-%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
|
|
256ebe |
-install -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \
|
|
|
256ebe |
- %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
|
|
256ebe |
-%endif
|
|
|
256ebe |
-
|
|
|
256ebe |
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
|
|
256ebe |
-install -D -p -m 0644 extras/logger.conf.example \
|
|
|
256ebe |
- %{buildroot}%{_sysconfdir}/glusterfs/logger.conf.example
|
|
|
256ebe |
-%endif
|
|
|
256ebe |
-%endif
|
|
|
256ebe |
-
|
|
|
256ebe |
%if ( 0%{!?_without_server:1} )
|
|
|
256ebe |
touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
|
|
|
256ebe |
touch %{buildroot}%{_sharedstatedir}/glusterd/options
|
|
|
256ebe |
--
|
|
|
256ebe |
1.8.3.1
|
|
|
256ebe |
|