Remove glusterfs-ganesha and glusterfs-regression-tests subpackages

glusterfs-ganesha is to using glusterfs as NFS server, which based
on NFS-Ganesha package. While NFS-Ganesha is not provided in openeuler.
So it is not necessary to keep subpackage.

glusterfs-regression is a test package which is unnecessary, so remove
it.

Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
(cherry picked from commit ceeeb885abb50c03be30f695d8de03290c24026c)
This commit is contained in:
Wenchao Hao 2022-01-26 09:19:48 +08:00 committed by openeuler-sync-bot
parent 09fb901684
commit 994cb4ecca

View File

@ -220,7 +220,7 @@
Summary: Distributed File System Summary: Distributed File System
Name: glusterfs Name: glusterfs
Version: 10.0 Version: 10.0
Release: 1 Release: 2
License: GPLv2 or LGPLv3+ License: 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} )
@ -386,51 +386,6 @@ Much of the code in GlusterFS is in user space and easily manageable.
This package provides support to FUSE based clients and inlcudes the This package provides support to FUSE based clients and inlcudes the
glusterfs(d) binary. glusterfs(d) binary.
%if ( 0%{!?_without_server:1} )
%package ganesha
Summary: NFS-Ganesha configuration
Group: Applications/File
Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: nfs-ganesha-selinux >= 2.7.6
Requires: nfs-ganesha-gluster >= 2.7.6
Requires: pcs >= 0.10.0
Requires: resource-agents >= 4.2.0
Requires: dbus
%if ( 0%{?rhel} && 0%{?rhel} == 6 )
Requires: cman, pacemaker, corosync
%endif
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 )
# we need portblock resource-agent in 3.9.5 and later.
Requires: net-tools
%endif
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
%if ( 0%{?rhel} && 0%{?rhel} < 8 )
Requires: selinux-policy >= 3.13.1-160
Requires(post): policycoreutils-python
Requires(postun): policycoreutils-python
%else
Requires(post): policycoreutils-python-utils
Requires(postun): policycoreutils-python-utils
%endif
%endif
%description ganesha
GlusterFS is a distributed file-system capable of scaling to several
petabytes. It aggregates various storage bricks over Infiniband RDMA
or TCP/IP interconnect into one large parallel network file
system. GlusterFS is one of the most sophisticated file systems in
terms of features and extensibility. It borrows a powerful concept
called Translators from GNU Hurd kernel. Much of the code in GlusterFS
is in user space and easily manageable.
This package provides the configuration and related files for using
NFS-Ganesha as the NFS server using GlusterFS
%endif
%if ( 0%{!?_without_georeplication:1} ) %if ( 0%{!?_without_georeplication:1} )
%package geo-replication %package geo-replication
Summary: GlusterFS Geo-replication Summary: GlusterFS Geo-replication
@ -675,22 +630,6 @@ Much of the code in GlusterFS is in user space and easily manageable.
This package contains the python modules of GlusterFS and own gluster This package contains the python modules of GlusterFS and own gluster
namespace. namespace.
%package regression-tests
Summary: Development Tools
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-fuse%{?_isa} = %{version}-%{release}
Requires: %{name}-server%{?_isa} = %{version}-%{release}
## thin provisioning support
Requires: lvm2 >= 2.02.89
Requires: perl(App::Prove) perl(Test::Harness) gcc util-linux-ng
Requires: python%{_pythonver}
Requires: attr dbench file git libacl-devel net-tools
Requires: nfs-utils xfsprogs yajl psmisc bc
%description regression-tests
The Gluster Test Framework, is a suite of scripts used for
regression testing of Gluster.
%if ( 0%{!?_without_ocf:1} ) %if ( 0%{!?_without_ocf:1} )
%package resource-agents %package resource-agents
Summary: OCF Resource Agents for GlusterFS Summary: OCF Resource Agents for GlusterFS
@ -939,15 +878,6 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
install -D -p -m 0644 extras/glusterfs-logrotate \ install -D -p -m 0644 extras/glusterfs-logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
# ganesha ghosts
%if ( 0%{!?_without_server:1} )
mkdir -p %{buildroot}%{_sysconfdir}/ganesha
touch %{buildroot}%{_sysconfdir}/ganesha/ganesha-ha.conf
mkdir -p %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/
touch %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha.conf
touch %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf
%endif
%if ( 0%{!?_without_georeplication:1} ) %if ( 0%{!?_without_georeplication:1} )
# geo-rep ghosts # geo-rep ghosts
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
@ -1003,14 +933,6 @@ exit 0
%systemd_post glustereventsd %systemd_post glustereventsd
%endif %endif
%if ( 0%{!?_without_server:1} )
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
%post ganesha
semanage boolean -m ganesha_use_fusefs --on
exit 0
%endif
%endif
%if ( 0%{!?_without_georeplication:1} ) %if ( 0%{!?_without_georeplication:1} )
%post geo-replication %post geo-replication
%if ( 0%{?rhel} && 0%{?rhel} >= 8 ) %if ( 0%{?rhel} && 0%{?rhel} >= 8 )
@ -1183,36 +1105,6 @@ fi
exit 0 exit 0
%endif %endif
%if ( 0%{!?_without_server:1} )
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
%postun ganesha
semanage boolean -m ganesha_use_fusefs --off
exit 0
%endif
%endif
##-----------------------------------------------------------------------------
## All %%trigger should be placed here and keep them sorted
##
%if ( 0%{!?_without_server:1} )
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
%trigger ganesha -- selinux-policy-targeted
semanage boolean -m ganesha_use_fusefs --on
exit 0
%endif
%endif
##-----------------------------------------------------------------------------
## All %%triggerun should be placed here and keep them sorted
##
%if ( 0%{!?_without_server:1} )
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
%triggerun ganesha -- selinux-policy-targeted
semanage boolean -m ganesha_use_fusefs --off
exit 0
%endif
%endif
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%files should be placed here and keep them grouped ## All %%files should be placed here and keep them grouped
## ##
@ -1276,12 +1168,16 @@ exit 0
%{_tmpfilesdir}/gluster.conf %{_tmpfilesdir}/gluster.conf
%endif %endif
%if ( 0%{?_without_server:1} ) #exclude regression-tests related
%exclude %{_datadir}/glusterfs/run-tests.sh
%exclude %{_datadir}/glusterfs/tests
%exclude %{_datadir}/glusterfs/tests/vagrant
#exclude ganesha related files #exclude ganesha related files
%exclude %{_sysconfdir}/ganesha/ganesha-ha.conf.sample %exclude %{_sysconfdir}/ganesha/ganesha-ha.conf.sample
%exclude %{_libexecdir}/ganesha/* %exclude %{_libexecdir}/ganesha/*
%exclude %{_prefix}/lib/ocf/resource.d/heartbeat/* %exclude %{_prefix}/lib/ocf/resource.d/heartbeat/*
%endif %exclude %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh
%files cli %files cli
%{_sbindir}/gluster %{_sbindir}/gluster
@ -1441,25 +1337,6 @@ exit 0
%{python2_sitelib}/gluster/cliutils %{python2_sitelib}/gluster/cliutils
%endif %endif
%files regression-tests
%dir %{_datadir}/glusterfs
%{_datadir}/glusterfs/run-tests.sh
%{_datadir}/glusterfs/tests
%exclude %{_datadir}/glusterfs/tests/vagrant
%if ( 0%{!?_without_server:1} )
%files ganesha
%dir %{_libexecdir}/ganesha
%{_sysconfdir}/ganesha/ganesha-ha.conf.sample
%{_libexecdir}/ganesha/*
%{_prefix}/lib/ocf/resource.d/heartbeat/*
%{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh
%ghost %attr(0644,-,-) %config(noreplace) %{_sysconfdir}/ganesha/ganesha-ha.conf
%ghost %dir %attr(0755,-,-) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha
%ghost %attr(0644,-,-) %config(noreplace) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha.conf
%ghost %attr(0644,-,-) %config(noreplace) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf
%endif
%if ( 0%{!?_without_ocf:1} ) %if ( 0%{!?_without_ocf:1} )
%files resource-agents %files resource-agents
# /usr/lib is the standard for OCF, also on x86_64 # /usr/lib is the standard for OCF, also on x86_64
@ -1639,8 +1516,11 @@ exit 0
%endif %endif
%changelog %changelog
* Wed Jan 26 2022 Wenchao Hao <haowenchao@huawei.com> - 10.0-2
- Remove unnecessary subpackages ganesha and regression-test
* Wed Dec 1 2021 Wenchao Hao <haowenchao@huawei.com> - 10.0-1 * Wed Dec 1 2021 Wenchao Hao <haowenchao@huawei.com> - 10.0-1
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git - Update to glusterfs-10.0-1
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 7.6-2 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 7.6-2
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git - DESC: delete -Sgit from %autosetup, and delete BuildRequires git