From 5a9b7e5ae76d4bc31b379b686199d0c722ef02f2 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Apr 15 2021 00:27:49 +0000
Subject: python-{cherrypy,bcrypt,pecan} -> python3->{cherrypy,bcrypt,pecan}

(sigh)

---

diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index 33d4632..6894b01 100644
--- a/SPECS/ceph.spec
+++ b/SPECS/ceph.spec
@@ -126,7 +126,7 @@
 #################################################################################
 Name:		ceph
 Version:	16.2.0
-Release:	2%{?dist}
+Release:	4%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -152,6 +152,7 @@ Patch0007:	0007-src-test-neorados-CMakeLists.txt.patch
 Patch0008:	0008-cmake-modules-Finduring.cmake.patch
 Patch0009:	0009-librgw-notifications-initialize-kafka-and-amqp.patch
 Patch0010:	0010-os-bluestore-strip-trailing-slash-for-directory-list.patch
+Patch0011:	0011-rgw.patch
 Source1:	cmake-modules-BuildBoost.cmake.noautopatch
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
@@ -247,9 +248,9 @@ BuildRequires:  %{luarocks_package_name}
 %if 0%{with make_check}
 BuildRequires:	jq
 BuildRequires:	libuuid-devel
-BuildRequires:	python-bcrypt
+BuildRequires:	python%{python3_pkgversion}-bcrypt
 BuildRequires:	python%{python3_pkgversion}-nose
-BuildRequires:	python-pecan
+BuildRequires:	python%{python3_pkgversion}-pecan
 BuildRequires:	python%{python3_pkgversion}-requests
 BuildRequires:	python%{python3_pkgversion}-dateutil
 BuildRequires:	python%{python3_pkgversion}-coverage
@@ -358,7 +359,7 @@ BuildRequires:	xmlsec1-nss
 %endif
 BuildRequires:	xmlsec1-openssl
 BuildRequires:	xmlsec1-openssl-devel
-BuildRequires:	python-cherrypy
+BuildRequires:	python%{python3_pkgversion}-cherrypy
 BuildRequires:	python%{python3_pkgversion}-jwt
 BuildRequires:	python-routes
 BuildRequires:	python%{python3_pkgversion}-scipy
@@ -572,7 +573,7 @@ Requires:	ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:	ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
 Requires:	ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel}
-Requires:	python-cherrypy
+Requires:	python%{python3_pkgversion}-cherrypy
 Requires:	python%{python3_pkgversion}-jwt
 Requires:	python-routes
 Requires:	python%{python3_pkgversion}-werkzeug
@@ -615,13 +616,13 @@ BuildArch:	noarch
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
-Requires:	python-bcrypt
-Requires:	python-pecan
+Requires:	python%{python3_pkgversion}-bcrypt
+Requires:	python%{python3_pkgversion}-pecan
 Requires:	python%{python3_pkgversion}-pyOpenSSL
 Requires:	python%{python3_pkgversion}-requests
 Requires:	python%{python3_pkgversion}-dateutil
 %if 0%{?fedora} || 0%{?rhel} >= 8
-Requires:	python-cherrypy
+Requires:	python%{python3_pkgversion}-cherrypy
 Requires:	python%{python3_pkgversion}-pyyaml
 Requires:	python%{python3_pkgversion}-werkzeug
 %endif
@@ -2498,8 +2499,14 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
+* Wed Apr 14 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.0-4
+- 16.2.0, python3-{cherrypy,bcrypt,pecan}
+
+* Tue Apr 13 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.0-3
+- 16.2.0, rgw fix
+
 * Thu Apr 1 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.0-2
-- 16.2.0 GA, cephadm
+- 16.2.0, cephadm
 
 * Wed Mar 31 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.0-1
 - 16.2.0 GA