|
 |
3604df |
From 796910b3d7f2a6455f57ed04e4d34142dba82808 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
Date: Tue, 13 Sep 2016 15:38:24 +0530
|
|
|
3604df |
Subject: [PATCH 46/86] eventsapi/packaging: Fix conflict during rpm install
|
|
|
3604df |
|
|
|
3604df |
RPM installation fails with following error
|
|
|
3604df |
|
|
|
3604df |
Error: Transaction check error:
|
|
|
3604df |
file /etc/glusterfs/eventsconfig.json conflicts between attempted
|
|
|
3604df |
installs of glusterfs-events-3.10dev-0.51.gitc9271ff.fc24.x86_64
|
|
|
3604df |
and glusterfs-server-3.10dev-0.51.gitc9271ff.fc24.x86_64
|
|
|
3604df |
|
|
|
3604df |
Changed attributes of eventsconfig.json file as same as other
|
|
|
3604df |
config files and excluded this file in server rpm.
|
|
|
3604df |
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15486
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
|
|
|
3604df |
BUG: 1351589
|
|
|
3604df |
Change-Id: I3708c8fc58448cd5a6ebe611250f10e0658bdd58
|
|
|
3604df |
Signed-off-by: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/84749
|
|
|
3604df |
Reviewed-by: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
glusterfs.spec.in | 6 +++++-
|
|
|
3604df |
1 files changed, 5 insertions(+), 1 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
3604df |
index 27032f4..06f1de1 100644
|
|
|
3604df |
--- a/glusterfs.spec.in
|
|
|
3604df |
+++ b/glusterfs.spec.in
|
|
|
3604df |
@@ -1279,6 +1279,7 @@ exit 0
|
|
|
3604df |
%doc extras/clear_xattrs.sh
|
|
|
3604df |
# sysconf
|
|
|
3604df |
%config(noreplace) %{_sysconfdir}/glusterfs
|
|
|
3604df |
+%exclude %{_sysconfdir}/glusterfs/eventsconfig.json
|
|
|
3604df |
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd
|
|
|
3604df |
%if ( 0%{_for_fedora_koji_builds} )
|
|
|
3604df |
%config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
|
|
|
3604df |
@@ -1401,7 +1402,7 @@ exit 0
|
|
|
3604df |
%if 0%{?_build_server}
|
|
|
3604df |
%if ( 0%{!?_without_events:1} )
|
|
|
3604df |
%files events
|
|
|
3604df |
-%config %attr(0600, root, root) %{_sysconfdir}/glusterfs/eventsconfig.json
|
|
|
3604df |
+%config(noreplace) %{_sysconfdir}/glusterfs/eventsconfig.json
|
|
|
3604df |
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/events
|
|
|
3604df |
%{_libexecdir}/glusterfs/events
|
|
|
3604df |
%{_libexecdir}/glusterfs/peer_eventsapi.py*
|
|
|
3604df |
@@ -2007,6 +2008,9 @@ end
|
|
|
3604df |
|
|
|
3604df |
%changelog
|
|
|
3604df |
* Fri Sep 16 2016 Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
+- Changed attribute of eventsconfig.json file as same as other configs (#1375532)
|
|
|
3604df |
+
|
|
|
3604df |
+* Fri Sep 16 2016 Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
- Added init script for glustereventsd (#1365395)
|
|
|
3604df |
|
|
|
3604df |
* Thu Sep 15 2016 Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|