fix upgrade error
Signed-off-by: lihaoxiang <lihaoxiang9@huawei.com> (cherry picked from commit 65a732256940961136df3557fecec0f607d08e7c)
This commit is contained in:
parent
26d65c58ce
commit
7b46d38585
@ -224,7 +224,7 @@
|
|||||||
Summary: Distributed File System
|
Summary: Distributed File System
|
||||||
Name: glusterfs
|
Name: glusterfs
|
||||||
Version: 10.0
|
Version: 10.0
|
||||||
Release: 6
|
Release: 7
|
||||||
License: GPLv3 or GPLv2+ or LGPLv3+
|
License: GPLv3 or GPLv2+ or LGPLv3+
|
||||||
URL: http://docs.gluster.org/
|
URL: http://docs.gluster.org/
|
||||||
%if ( 0%{_for_fedora_koji_builds} )
|
%if ( 0%{_for_fedora_koji_builds} )
|
||||||
@ -765,6 +765,13 @@ GlusterFS Events
|
|||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%package help
|
||||||
|
Summary: Including man files for glusterfs.
|
||||||
|
Requires: man
|
||||||
|
|
||||||
|
%description help
|
||||||
|
This contains man files for the using of glusterfs.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version}%{?prereltag} -p1
|
%autosetup -n %{name}-%{version}%{?prereltag} -p1
|
||||||
%if ( ! %{_usepython3} )
|
%if ( ! %{_usepython3} )
|
||||||
@ -1112,10 +1119,6 @@ exit 0
|
|||||||
##
|
##
|
||||||
%files
|
%files
|
||||||
%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README.md THANKS COMMITMENT
|
%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README.md THANKS COMMITMENT
|
||||||
%{_mandir}/man8/*gluster*.8*
|
|
||||||
%if ( 0%{!?_without_server:1} )
|
|
||||||
%exclude %{_mandir}/man8/gluster.8*
|
|
||||||
%endif
|
|
||||||
%dir %{_localstatedir}/log/glusterfs
|
%dir %{_localstatedir}/log/glusterfs
|
||||||
%if 0%{?!_without_server:1}
|
%if 0%{?!_without_server:1}
|
||||||
%dir %{_datadir}/glusterfs
|
%dir %{_datadir}/glusterfs
|
||||||
@ -1183,7 +1186,6 @@ exit 0
|
|||||||
|
|
||||||
%files cli
|
%files cli
|
||||||
%{_sbindir}/gluster
|
%{_sbindir}/gluster
|
||||||
%{_mandir}/man8/gluster.8*
|
|
||||||
%{_sysconfdir}/bash_completion.d/gluster
|
%{_sysconfdir}/bash_completion.d/gluster
|
||||||
|
|
||||||
%files cloudsync-plugins
|
%files cloudsync-plugins
|
||||||
@ -1380,9 +1382,6 @@ exit 0
|
|||||||
# symlink. The binary itself (and symlink) are part of the glusterfs-fuse
|
# symlink. The binary itself (and symlink) are part of the glusterfs-fuse
|
||||||
# package, because glusterfs-server depends on that anyway.
|
# package, because glusterfs-server depends on that anyway.
|
||||||
|
|
||||||
# Manpages
|
|
||||||
%{_mandir}/man8/gluster-setgfid2path.8*
|
|
||||||
|
|
||||||
# xlators
|
# xlators
|
||||||
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
|
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
|
||||||
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
|
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
|
||||||
@ -1517,7 +1516,13 @@ exit 0
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%files help
|
||||||
|
%{_mandir}/man8/*gluster*.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 7 2023 lihaoxiang <lihaoxiang9@huawei.com> - 10.0-7
|
||||||
|
- fix upgrade error that %{_mandir}/man8/*gluster*.8* belong to package glusterfs currently conflict with that belong to package help in the lower version.
|
||||||
|
|
||||||
* Tue Oct 18 2022 zhanchengbin <zhanchengbin1@huawei.com> - 10.0-6
|
* Tue Oct 18 2022 zhanchengbin <zhanchengbin1@huawei.com> - 10.0-6
|
||||||
- license: fix license error.
|
- license: fix license error.
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user