From ce8aeac3f16148f3dba8bee3f939ce44d1d5faec Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 27 Jan 2020 10:33:25 -0500
Subject: [PATCH] ceph-14.2.6, missing includes

---
 0003-src-common-bitstr.h.patch           | 13 +++++++++++++
 0004-src-librbd-api-PoolMetadata.h.patch | 10 ++++++++++
 ceph.spec                                |  9 +++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 0003-src-common-bitstr.h.patch
 create mode 100644 0004-src-librbd-api-PoolMetadata.h.patch

diff --git a/0003-src-common-bitstr.h.patch b/0003-src-common-bitstr.h.patch
new file mode 100644
index 0000000..612f4fe
--- /dev/null
+++ b/0003-src-common-bitstr.h.patch
@@ -0,0 +1,13 @@
+--- 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>
+ #include <functional>
++#include <ostream>
+ 
+ namespace ceph {
+   class Formatter;
diff --git a/0004-src-librbd-api-PoolMetadata.h.patch b/0004-src-librbd-api-PoolMetadata.h.patch
new file mode 100644
index 0000000..98f9b63
--- /dev/null
+++ b/0004-src-librbd-api-PoolMetadata.h.patch
@@ -0,0 +1,10 @@
+--- 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 553a53a..e682749 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -26,7 +26,7 @@
 %global _hardened_build 1
 
 %bcond_without ocf
-%bcond_with make_check
+%bcond_without make_check
 %bcond_without ceph_test_package
 %ifarch s390 s390x
 %bcond_with tcmalloc
@@ -109,7 +109,7 @@
 #################################################################################
 Name:		ceph
 Version:	14.2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -126,6 +126,8 @@ Group:		System/Filesystems
 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
 #################################################################################
@@ -2265,6 +2267,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- ceph 14.2.6, gcc-10, missing includes
+
 * Thu Jan 9 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-2
 - ceph 14.2.6