diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index 7a2c8b8..0c9951b 100644
--- a/SPECS/ceph.spec
+++ b/SPECS/ceph.spec
@@ -101,7 +101,7 @@
#################################################################################
Name: ceph
Version: 15.2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -391,8 +391,8 @@ Summary: Ceph Base Package
%if 0%{?suse_version}
Group: System/Filesystems
%endif
-Provides: ceph-test:/usr/bin/ceph-kvstore-tool
-Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
+Provides: %{name}-test:/usr/bin/ceph-kvstore-tool
+Requires: %{name}-common = %{_epoch_prefix}%{version}-%{release}
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
@@ -439,7 +439,7 @@ Recommends: podman
Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed
with systemd and podman.
-%package -n ceph-common
+%package common
Summary: Ceph Common
%if 0%{?suse_version}
Group: System/Filesystems
@@ -451,8 +451,8 @@ Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{relea
Requires: python%{python3_pkgversion}-rbd = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-cephfs = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rgw = %{_epoch_prefix}%{version}-%{release}
-Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
-Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{python3_pkgversion}-%{name}-argparse = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{python3_pkgversion}-%{name}-common = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{python3_pkgversion}-prettytable
%endif
@@ -466,7 +466,7 @@ Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
%if 0%{?suse_version}
Requires(pre): pwdutils
%endif
-%description -n ceph-common
+%description common
Common utilities to mount and interact with a ceph storage cluster.
Comprised of files that are common to Ceph clients and servers.
@@ -766,7 +766,7 @@ Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: lvm2
Requires: sudo
Requires: libstoragemgmt
-Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{python3_pkgversion}-%{name}-common = %{_epoch_prefix}%{version}-%{release}
%if 0%{?weak_deps}
Recommends: nvme-cli
%if 0%{?suse_version}
@@ -994,7 +994,7 @@ Group: Development/Libraries/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
-Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{python3_pkgversion}-%{name}-argparse = %{_epoch_prefix}%{version}-%{release}
%{?python_provide:%python_provide python%{python3_pkgversion}-cephfs}
Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release}
@@ -1002,19 +1002,19 @@ Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release}
This package contains Python 3 libraries for interacting with Cephs distributed
file system.
-%package -n python%{python3_pkgversion}-ceph-argparse
+%package -n python%{python3_pkgversion}-%{name}-argparse
Summary: Python 3 utility libraries for Ceph CLI
%if 0%{?suse_version}
Group: Development/Libraries/Python
%endif
-%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-argparse}
-%description -n python%{python3_pkgversion}-ceph-argparse
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-argparse}
+%description -n python%{python3_pkgversion}-%{name}-argparse
This package contains types and routines for Python 3 used by the Ceph CLI as
well as the RESTful interface. These have to do with querying the daemons for
command-description information, validating user command input against those
descriptions, and submitting the command to the appropriate daemon.
-%package -n python%{python3_pkgversion}-ceph-common
+%package -n python%{python3_pkgversion}-%{name}-common
Summary: Python 3 utility libraries for Ceph
%if 0%{?fedora} || 0%{?rhel} >= 8
Requires: python%{python3_pkgversion}-pyyaml
@@ -1025,8 +1025,8 @@ Requires: python%{python3_pkgversion}-PyYAML
%if 0%{?suse_version}
Group: Development/Libraries/Python
%endif
-%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-common}
-%description -n python%{python3_pkgversion}-ceph-common
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-common}
+%description -n python%{python3_pkgversion}-%{name}-common
This package contains data structures, classes and functions used by Ceph.
It also contains utilities used for the cephadm orchestrator.
@@ -1043,7 +1043,7 @@ works like an FTP client.
%endif
%if 0%{with ceph_test_package}
-%package -n ceph-test
+%package test
Summary: Ceph benchmarks and test tools
%if 0%{?suse_version}
Group: System/Benchmark
@@ -1052,9 +1052,9 @@ Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
Requires: xmlstarlet
Requires: jq
Requires: socat
-Requires: gtest
-Requires: gmock
-%description -n ceph-test
+Requires: gtest-devel
+Requires: gmock-devel
+%description test
This package contains Ceph benchmarks and test tools.
%endif
@@ -2223,13 +2223,13 @@ fi
%{python3_sitelib}/ceph_volume_client.py
%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py*
-%files -n python%{python3_pkgversion}-ceph-argparse
+%files -n python%{python3_pkgversion}-%{name}-argparse
%{python3_sitelib}/ceph_argparse.py
%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
%{python3_sitelib}/ceph_daemon.py
%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
-%files -n python%{python3_pkgversion}-ceph-common
+%files -n python%{python3_pkgversion}-%{name}-common
%{python3_sitelib}/ceph
%{python3_sitelib}/ceph-*.egg-info
@@ -2240,7 +2240,7 @@ fi
%endif
%if 0%{with ceph_test_package}
-%files -n ceph-test
+%files test
%{_bindir}/ceph-client-debug
%{_bindir}/ceph_bench_log
%{_bindir}/ceph_kvstorebench
@@ -2393,6 +2393,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog
+* Tue Mar 30 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:15.2.10-3
+- ceph 15.2.10 GA, ceph-test really requires gtest-devel and gmock-devel
+
* Tue Mar 30 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:15.2.10-2
- ceph 15.2.10 GA, w/ unbundled cephadm >= %{_epoch_prefix}%{version}-%{release}