From 4f48590d7c992a42fa28ae8dcc4c60100a49abc8 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Oct 21 2020 02:06:32 +0000
Subject: ceph 14.2.12 GA


Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

---

diff --git a/0003-src-common-bitstr.h.patch b/0003-src-common-bitstr.h.patch
index 612f4fe..e945c1c 100644
--- a/0003-src-common-bitstr.h.patch
+++ b/0003-src-common-bitstr.h.patch
@@ -1,11 +1,8 @@
 --- ceph-14.2.6/src/common/bit_str.h.orig	2020-01-24 11:37:20.547679336 -0500
 +++ ceph-14.2.6/src/common/bit_str.h	2020-01-24 11:37:55.351904895 -0500
-@@ -14,7 +14,10 @@
- #ifndef CEPH_COMMON_BIT_STR_H
- #define CEPH_COMMON_BIT_STR_H
- 
-+#include <cstdint>
-+#include <iosfwd>
+@@ -17,6 +17,7 @@
+ #include <cstdint>
+ #include <iosfwd>
  #include <functional>
 +#include <ostream>
  
diff --git a/0004-src-librbd-api-PoolMetadata.h.patch b/0004-src-librbd-api-PoolMetadata.h.patch
deleted file mode 100644
index 98f9b63..0000000
--- a/0004-src-librbd-api-PoolMetadata.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig	2020-01-24 12:39:23.738816885 -0500
-+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h	2020-01-24 12:39:36.522902386 -0500
-@@ -8,6 +8,7 @@
- #include "include/rados/librados_fwd.hpp"
- 
- #include <map>
-+#include <string>
- 
- namespace librbd {
- 
diff --git a/ceph.spec b/ceph.spec
index ad3a9ec..5dce428 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -111,7 +111,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	14.2.11
+Version:	14.2.12
 Release:	1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -130,7 +130,6 @@ URL:		http://ceph.com/
 Source0:	%{?_remote_tarball_prefix}ceph-%{version}.tar.gz
 Patch002:	0002-src-common-CMakeLists.txt.patch
 Patch003:	0003-src-common-bitstr.h.patch
-Patch004:	0004-src-librbd-api-PoolMetadata.h.patch
 # ceph ≥ 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
 %if 0%{?suse_version}
@@ -486,9 +485,12 @@ Recommends:	ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release}
 Recommends:	python%{_python_buildid}-influxdb
 %endif
 %if 0%{?rhel} == 7
-Requires:       pyOpenSSL
+Requires:	pyOpenSSL
 %else
-Requires:       python%{_python_buildid}-pyOpenSSL
+Requires:	python%{_python_buildid}-pyOpenSSL
+%endif
+%if 0%{?rhel} < 8 || 0%{?suse_version}
+Requires:	python-enum34
 %endif
 %description mgr
 ceph-mgr enables python modules that provide services (such as the REST
@@ -686,6 +688,10 @@ Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
 Requires:	lvm2
 Requires:	sudo
 Requires: libstoragemgmt
+%if 0%{?weak_deps}
+Recommends:	nvme-cli
+Recommends:	smartmontools
+%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
@@ -2322,6 +2328,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Oct 20 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.12-1
+- ceph 14.2.12 GA
+
 * Tue Aug 11 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.11-1
 - ceph 14.2.11 GA
 
diff --git a/sources b/sources
index 09d401d..50b7b90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-14.2.11.tar.gz) = 765e8982d457cfd900acddc8f82c23824b32dc6d925d45e7693cba48c06fab798b6d57991dc9ad18a9ace9aff6fb2b917bd97f2d6435a7caceb03c9733e9602a
+SHA512 (ceph-14.2.12.tar.gz) = 5880f274732b5c6cd58d42ddda7627241b72a8d403e905032fc11d4cb01865d1553ac5e151ea443617d44279a57c6a9b4d71c4a386155ac2f9ae5ebebbae814d