From f6c80111f0fd513d8f40774966b4ac513ff64b22 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Wed, 7 Jul 2021 10:39:57 -0400
Subject: [PATCH] Rebuild for new fmt version.

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 0013-src-common-Formatter.cc.patch | 10 ++++++++++
 ceph.spec                          |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 0013-src-common-Formatter.cc.patch

diff --git a/0013-src-common-Formatter.cc.patch b/0013-src-common-Formatter.cc.patch
new file mode 100644
index 0000000..c31fc1a
--- /dev/null
+++ b/0013-src-common-Formatter.cc.patch
@@ -0,0 +1,10 @@
+--- ceph-16.2.4/src/common/Formatter.cc.orig	2021-07-07 09:32:25.513818420 -0400
++++ ceph-16.2.4/src/common/Formatter.cc	2021-07-07 09:44:42.007373294 -0400
+@@ -21,6 +21,7 @@
+ #include <fmt/format.h>
+ #include <set>
+ #include <limits>
++#include <algorithm>
+ 
+ // -----------------------
+ namespace ceph {
diff --git a/ceph.spec b/ceph.spec
index 3ae42dd..6aae12c 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -153,6 +153,7 @@ Patch0009:	0009-librgw-notifications-initialize-kafka-and-amqp.patch
 Patch0010:	0010-os-bluestore-strip-trailing-slash-for-directory-list.patch
 Patch0011:	0011-src-test-rgw-amqp_mock.cc.patch
 Patch0012:	0012-src-compressor-snappy-SnappyCompressor.h.patch
+Patch0013:	0013-src-common-Formatter.cc.patch
 # Source1:	cmake-modules-BuildBoost.cmake.noautopatch
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
@@ -1299,7 +1300,7 @@ mkdir build
 cd build
 %{cmake} .. \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DCMAKE_COLOR_MAKEFILE=OFF \
+    -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
     -DBUILD_CONFIG=rpmbuild \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
@@ -1387,6 +1388,7 @@ cat ./CMakeFiles/CMakeError.log
 
 export VERBOSE=1
 export V=1
+export GCC_COLORS=
 %cmake_build "$CEPH_MFLAGS_JOBS"