From ef8dc618c70081370491e92971cbacf2d705d8ed Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 9 Mar 2020 21:41:53 -0400
Subject: [PATCH] ceph 15.1.0, rhbz#1809799

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 ceph.spec                                                  | 7 ++++---
 ...ake.patch => cmake-modules-BuildBoost.cmake.noautopatch | 0
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename 0005-cmake-modules-BuildBoost.cmake.patch => cmake-modules-BuildBoost.cmake.noautopatch (100%)

diff --git a/ceph.spec b/ceph.spec
index 7facbe3..a5e63fe 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -130,9 +130,7 @@ Patch0001:	0001-src-common-crc32c_intel_fast.patch
 Patch0002:	0002-src-common-CMakeLists.txt.patch
 Patch0003:	0003-src-common-bitstr.h.patch
 Patch0004:	0004-src-test-rgw-test_rgw_reshart_wait.cc.patch
-%ifarch x86_64
-Patch0005:	0005-cmake-modules-BuildBoost.cmake.patch
-%endif
+Source1::	cmake-modules-BuildBoost.cmake.noautopatch
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
 #################################################################################
@@ -1081,6 +1079,9 @@ This package provides Ceph’s default alerts for Prometheus.
 #################################################################################
 %prep
 %autosetup -p1
+%ifarch x86_64
+patch -p1 < %{SOURCE1}
+%endif
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed:
diff --git a/0005-cmake-modules-BuildBoost.cmake.patch b/cmake-modules-BuildBoost.cmake.noautopatch
similarity index 100%
rename from 0005-cmake-modules-BuildBoost.cmake.patch
rename to cmake-modules-BuildBoost.cmake.noautopatch