From 3c5928db80d6da2c5662d153c9a047d708426d9b Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Mar 22 2022 13:48:28 +0000
Subject: ceph 15.2.16 GA


---

diff --git a/.ceph.metadata b/.ceph.metadata
index 0bc6627..962700c 100644
--- a/.ceph.metadata
+++ b/.ceph.metadata
@@ -1 +1 @@
-6502c5c8bbbf1a6a73afb81e21e220c07da53790  SOURCES/ceph-15.2.15.tar.gz
+f06f0e9dd565932933e21b027e7c98c8f0481671  SOURCES/ceph-15.2.16.tar.gz
diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index 9136cf0..b8fdced 100644
--- a/SPECS/ceph.spec
+++ b/SPECS/ceph.spec
@@ -100,7 +100,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	15.2.15
+Version:	15.2.16
 Release:	1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -424,6 +424,12 @@ Requires:	gperftools-libs >= 2.6.1
 %endif
 %if 0%{?weak_deps}
 Recommends:	chrony
+Recommends:	nvme-cli
+%if 0%{?suse_version}
+Requires:	smartmontools
+%else
+Recommends:	smartmontools
+%endif
 %endif
 %description base
 Base is the package that includes all the files shared amongst ceph servers
@@ -492,14 +498,7 @@ Group:		System/Filesystems
 %endif
 Provides:	ceph-test:/usr/bin/ceph-monstore-tool
 Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
-%if 0%{?weak_deps}
-Recommends:    nvme-cli
-%if 0%{?suse_version}
-Requires:      smartmontools
-%else
-Recommends:    smartmontools
-%endif
-%endif
+
 %description mon
 ceph-mon is the cluster monitor daemon for the Ceph distributed file
 system. One or more instances of ceph-mon form a Paxos part-time
@@ -775,14 +774,7 @@ Requires:	lvm2
 Requires:	sudo
 Requires:	libstoragemgmt
 Requires:	python%{python3_pkgversion}-%{name}-common = %{_epoch_prefix}%{version}-%{release}
-%if 0%{?weak_deps}
-Recommends:    nvme-cli
-%if 0%{?suse_version}
-Requires:      smartmontools
-%else
-Recommends:    smartmontools
-%endif
-%endif
+
 %description osd
 ceph-osd is the object storage daemon for the Ceph distributed file
 system.  It is responsible for storing objects on a local file system
@@ -1351,7 +1343,7 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
 
 # sudoers.d
-install -m 0440 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
+install -m 0440 -D sudoers.d/ceph-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-smartctl
 
 %if 0%{?rhel} >= 8
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
@@ -1449,6 +1441,7 @@ install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildro
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mgr
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
+%{_sysconfdir}/sudoers.d/ceph-smartctl
 
 %post base
 /sbin/ldconfig
@@ -2005,7 +1998,6 @@ fi
 %{_unitdir}/ceph-volume@.service
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd
 %config(noreplace) %{_sysctldir}/90-ceph-osd.conf
-%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
 
 %post osd
 %if 0%{?suse_version}