Merge remote-tracking branch 'origin/f32' into f31

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

0003-src-common-bitstr.h.patch

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
+--- ceph-15.1.0/src/common/bit_str.h.orig	2020-02-03 09:47:20.047149798 -0500
++++ ceph-15.1.0/src/common/bit_str.h	2020-02-03 09:47:50.213149798 -0500
+=======
 --- 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
+>>>>>>> origin/f32
 @@ -17,6 +17,7 @@
  #include <cstdint>
  #include <iosfwd>
@@ -8,3 +13,14 @@
  
  namespace ceph {
    class Formatter;
+--- ceph-15.2.4/src/global/signal_handler.h.orig        2020-07-17 12:57:54.763628429 -0400
++++ ceph-15.2.4/src/global/signal_handler.h     2020-07-17 12:58:10.610628429 -0400
+@@ -16,6 +16,8 @@
+ #define CEPH_GLOBAL_SIGNAL_HANDLER_H
+
+ #include <signal.h>
++#include <string>
++
+ #include "acconfig.h"
+
+ typedef void (*signal_handler_t)(int);

ceph.spec

@@ -144,6 +144,7 @@ Requires:       ceph-mds = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-mon = %{_epoch_prefix}%{version}-%{release}
 Requires(post):	binutils
+
 %if 0%{with cephfs_java}
 BuildRequires:	java-devel
 BuildRequires:	sharutils
@@ -167,6 +168,10 @@ BuildRequires:	devtoolset-8-gcc-c++ >= 8.2.1
 %else
 BuildRequires:	gcc-c++
 %endif
+%ifarch s390 s390x
+# unlike with gcc-10, installing gcc-9 does not include gcc/libatomic
+BuildRequires:	libatomic
+%endif
 BuildRequires:	gdbm
 %if 0%{with tcmalloc}
 %if 0%{?fedora} || 0%{?rhel}
@@ -1275,8 +1280,8 @@ make "$CEPH_MFLAGS_JOBS"
 %if 0%{with make_check}
 %check
 # run in-tree unittests
-# cd build
-# ctest "$CEPH_MFLAGS_JOBS"
+cd build
+ctest "$CEPH_MFLAGS_JOBS"
 %endif
 
 
@@ -2358,12 +2363,9 @@ exit 0
 * Sat Feb 1 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.7-1
 - ceph 14.2.7 GA
 
-* Wed Jan 29 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-4
+* Thu Jan 30 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
 - ceph 14.2.6, https://tracker.ceph.com/issues/43649
 
-* Mon Jan 27 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
-- ceph 14.2.6, (temporarily) disable unit tests
-
 * Fri Jan 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
 - ceph 14.2.6, gcc-10, missing includes