!66 修复glusterfs7.0版本升级至11.0时报错

From: @tjwangxm 
Reviewed-by: @swf504 
Signed-off-by: @swf504

glusterfs.spec

@@ -224,7 +224,7 @@
 Summary:          Distributed File System
 Name:             glusterfs
 Version:          11.1
-Release:          1 
+Release:          2 
 License:          GPLv3 or GPLv2+ or LGPLv3+
 URL:              http://docs.gluster.org/
 %if ( 0%{_for_fedora_koji_builds} )
@@ -751,6 +751,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} )
@@ -1095,10 +1102,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
@@ -1166,7 +1169,6 @@ exit 0
 
 %files cli
 %{_sbindir}/gluster
-%{_mandir}/man8/gluster.8*
 %{_sysconfdir}/bash_completion.d/gluster*
 
 %files cloudsync-plugins
@@ -1359,9 +1361,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
@@ -1497,7 +1496,13 @@ exit 0
 %endif
 %endif
 
+%files help
+%{_mandir}/man8/*gluster*.8*
+
 %changelog
+* Wed Mar 13 2024 wangxiaomeng <wangxiaomeng@kylinos.cn> - 11.1-2
+- fix upgrade error that %{_mandir}/man8/*gluster*.8* belong to package glusterfs currently conflict with that belong to package help in the lower version.
+
 * Sat Jan 27 2024 wuguanghao <wuguanghao3@huawei.com> - 11.1-1
 - upgrade to 11.1
   - add simple-quota xattr to afr and ec ignore list