From 30b06a817961249da626d69fb0deb58a53772d23 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Fri, 18 Aug 2017 09:25:01 -0400
Subject: [PATCH 1/2] fix %epoch in comment, ppc64le lowmem_builder

---
 ceph.spec | 20 +++++++++++++++++---
 sources   |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ceph.spec b/ceph.spec
index 3307dc0..c709589 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -36,8 +36,16 @@
 %ifnarch armv7hl
 %bcond_with lowmem_builder
 %else
+%if 0%{?rhel}
+%ifnarch ppc64le
+%bcond_with lowmem_builder
+%else
 %bcond_without lowmem_builder
 %endif
+%else
+%bcond_without lowmem_builder
+%endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 %bcond_without selinux
 %endif
@@ -77,13 +85,13 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	12.1.3
-Release:	1%{?dist}
+Version:	12.1.4
+Release:	2%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		1
 %endif
 
-# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
+# define %%_epoch_prefix macro which will expand to the empty string if %%epoch is undefined
 %global _epoch_prefix %{?epoch:%{epoch}:}
 
 Summary:	User space components of the Ceph file system
@@ -1784,6 +1792,12 @@ exit 0
 
 
 %changelog
+* Thu Aug 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-2
+- fix %%epoch in comment, ppc64le lowmem_builder
+
+* Wed Aug 16 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-1
+- New release (1:12.1.4-1)
+
 * Sat Aug 12 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.3-1
 - New release (1:12.1.3-1)
 
diff --git a/sources b/sources
index 9b75234..cc5abc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-12.1.3.tar.gz) = 989bda3ad64df23fc7a3efd1db1922f17de0fca837f0d37f5e953433519070c609fcbd74a3c862ae06f6a862527aa3ece7c7d1a8c8d62649800087287508e423
+SHA512 (ceph-12.1.4.tar.gz) = be4d11ec3aa47ccc7c31e81dec7db913e68d344e3594baefb87ddc4ca58b3eba00f42a8b34454e6ef8145bed790280788487278bedf67b65616f4e387f09d170

From c19045b38337e013691798c4c5f19d3bf1a57e5f Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 23 Aug 2017 09:00:09 -0700
Subject: [PATCH 2/2] Disable RDMA support on 32-bit ARM (#1484155)

---
 ceph.spec | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ceph.spec b/ceph.spec
index c709589..eb63771 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -86,7 +86,7 @@
 #################################################################################
 Name:		ceph
 Version:	12.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		1
 %endif
@@ -206,7 +206,10 @@ BuildRequires:  boost-random
 BuildRequires:	btrfs-progs
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
+# RDMA is no longer built on 32-bit ARM: see #1484155
+%ifnarch %{arm}
 BuildRequires:	libibverbs-devel
+%endif
 BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  redhat-lsb-core
@@ -882,6 +885,10 @@ cmake .. \
     -DWITH_RADOSGW_BEAST_FRONTEND=ON \
 %else
     -DWITH_RADOSGW_BEAST_FRONTEND=OFF \
+%endif
+# RDMA is no longer built on 32-bit ARM: see #1484155
+%ifnarch %{arm}
+    -DWITH_RDMA=OFF \
 %endif
     -DBOOST_J=%{_smp_ncpus}
 
@@ -1792,6 +1799,9 @@ exit 0
 
 
 %changelog
+* Tue Aug 22 2017 Adam Williamson <awilliam@redhat.com> - 1:12.1.4-3
+- Disable RDMA support on 32-bit ARM (#1484155)
+
 * Thu Aug 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-2
 - fix %%epoch in comment, ppc64le lowmem_builder