diff options
| author | Aravinda VK <avishwan@redhat.com> | 2016-09-13 15:38:24 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-09-14 20:04:26 -0700 |
| commit | 656873c4c8f5f3b05823c51f20c2a44106662550 (patch) | |
| tree | 5f5cfa45cdaf460224514d525566ed688e46f9da /glusterfs.spec.in | |
| parent | 7e1ee2efa0b4f5c42a48282204f3d3977ab41fe2 (diff) | |
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.
BUG: 1375532
Change-Id: I3708c8fc58448cd5a6ebe611250f10e0658bdd58
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/15486
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 6 |
1 files changed, 5 insertions, 1 deletions
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 <avishwan@redhat.com> +- Changed attribute of eventsconfig.json file as same as other configs (#1375532) + * Thu Sep 08 2016 Aravinda VK <avishwan@redhat.com> - Added init script for glustereventsd (#1365395) |