From aea936562540d15a6c4708ec9ef050136de483b3 Mon Sep 17 00:00:00 2001 From: Aravinda VK Date: Tue, 13 Sep 2016 15:38:24 +0530 Subject: 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: 1376331 Change-Id: I3708c8fc58448cd5a6ebe611250f10e0658bdd58 Signed-off-by: Aravinda VK (cherry picked from commit 656873c4c8f5f3b05823c51f20c2a44106662550) Reviewed-on: http://review.gluster.org/15502 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Milind Changire --- glusterfs.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 85decbd5a7f..19988db0910 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1105,6 +1105,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 @@ -1235,7 +1236,7 @@ exit 0 # Events %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* @@ -1250,6 +1251,9 @@ exit 0 %endif %changelog +* Wed Sep 14 2016 Aravinda VK +- Changed attribute of eventsconfig.json file as same as other configs (#1375532) + * Thu Sep 08 2016 Aravinda VK - Added init script for glustereventsd (#1365395) -- cgit