Remove conflicting _localstatedir_/run/gluster

The two RPMs 'glusterfs' and 'glusterfs-server' have
_localstatedir_/run/gluster in their %files section. Because these are
not equal, the installation of 'glusterfs-server' fails (as it pulls in
'glusterfs' too):

DEBUG util.py:439:  Dependencies resolved.
DEBUG util.py:439:  ================================================================================
DEBUG util.py:439:   Package                         Arch     Version                 Repository
DEBUG util.py:439:                                                                             Size
DEBUG util.py:439:  ================================================================================
DEBUG util.py:439:  Installing:
...
DEBUG util.py:439:   glusterfs                       x86_64   3.11.0-0.1.rc0.fc27     build   575 k
DEBUG util.py:439:   glusterfs-api                   x86_64   3.11.0-0.1.rc0.fc27     build    99 k
DEBUG util.py:439:   glusterfs-api-devel             x86_64   3.11.0-0.1.rc0.fc27     build    44 k
DEBUG util.py:439:   glusterfs-cli                   x86_64   3.11.0-0.1.rc0.fc27     build   204 k
DEBUG util.py:439:   glusterfs-client-xlators        x86_64   3.11.0-0.1.rc0.fc27     build   844 k
DEBUG util.py:439:   glusterfs-devel                 x86_64   3.11.0-0.1.rc0.fc27     build   183 k
DEBUG util.py:439:   glusterfs-extra-xlators         x86_64   3.11.0-0.1.rc0.fc27     build    95 k
DEBUG util.py:439:   glusterfs-fuse                  x86_64   3.11.0-0.1.rc0.fc27     build   144 k
DEBUG util.py:439:   glusterfs-libs                  x86_64   3.11.0-0.1.rc0.fc27     build   389 k
DEBUG util.py:439:   glusterfs-server                x86_64   3.11.0-0.1.rc0.fc27     build   1.3 M
...
DEBUG util.py:439:  Running transaction test
DEBUG util.py:439:  Error: Transaction check error:
DEBUG util.py:439:    file /var/run/gluster conflicts between attempted installs of glusterfs-server-3.11.0-0.1.rc0.fc27.x86_64 and glusterfs-3.11.0-0.1.rc0.fc27.x86_64

Koshei reported this while rebuilding glusterfs-coreutils:
- https://apps.fedoraproject.org/koschei/package/glusterfs-coreutils?collection=f27
- https://koji.fedoraproject.org/koji/taskinfo?taskID=19461192

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2017-05-09 10:08:32 +02:00
parent 94a3248f29
commit 6bd56d6b07

View File

@ -176,7 +176,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 3.11.0
Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
Release: 0.2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@ -1199,7 +1199,6 @@ exit 0
%if ( 0%{?_with_gnfs:1} )
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/*
%endif
%dir %{_localstatedir}/run/gluster
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd
%if ( 0%{_for_fedora_koji_builds} )
%config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
@ -1335,6 +1334,9 @@ exit 0
%endif
%changelog
* Tue May 9 2017 Niels de Vos <ndevos@redhat.com> - 3.11.0-0.2rc0
- remove conflicting _localstate_/run/gluster dir
* Mon May 8 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.0-0.1rc0
- 3.11.0 RC0