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