From 7b46d38585698e187c2544571abcd4396fed0d4d Mon Sep 17 00:00:00 2001 From: lihaoxiang Date: Tue, 7 Feb 2023 07:51:44 +0000 Subject: [PATCH] fix upgrade error Signed-off-by: lihaoxiang (cherry picked from commit 65a732256940961136df3557fecec0f607d08e7c) --- glusterfs.spec | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 68f0d5b..9a126b5 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -224,7 +224,7 @@ Summary: Distributed File System Name: glusterfs Version: 10.0 -Release: 6 +Release: 7 License: GPLv3 or GPLv2+ or LGPLv3+ URL: http://docs.gluster.org/ %if ( 0%{_for_fedora_koji_builds} ) @@ -765,6 +765,13 @@ GlusterFS Events %endif +%package help +Summary: Including man files for glusterfs. +Requires: man + +%description help +This contains man files for the using of glusterfs. + %prep %autosetup -n %{name}-%{version}%{?prereltag} -p1 %if ( ! %{_usepython3} ) @@ -1112,10 +1119,6 @@ exit 0 ## %files %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 %if 0%{?!_without_server:1} %dir %{_datadir}/glusterfs @@ -1183,7 +1186,6 @@ exit 0 %files cli %{_sbindir}/gluster -%{_mandir}/man8/gluster.8* %{_sysconfdir}/bash_completion.d/gluster %files cloudsync-plugins @@ -1380,9 +1382,6 @@ exit 0 # symlink. The binary itself (and symlink) are part of the glusterfs-fuse # package, because glusterfs-server depends on that anyway. -# Manpages -%{_mandir}/man8/gluster-setgfid2path.8* - # xlators %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features @@ -1517,7 +1516,13 @@ exit 0 %endif %endif +%files help +%{_mandir}/man8/*gluster*.8* + %changelog +* Tue Feb 7 2023 lihaoxiang - 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 - 10.0-6 - license: fix license error. -- Gitee