From 467955622d87f891723f3b519bc3fb8bff82bbd2 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Tue, 25 Jul 2017 14:01:02 -0400
Subject: [PATCH] 12.1.1 w/ rocksdb patch (i686), disable ceph_java (armv7hl)

---
 0001-src-rocksdb-util-murmurhash.patch | 13 +++++++++++++
 ceph.spec                              | 11 +++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 0001-src-rocksdb-util-murmurhash.patch

diff --git a/0001-src-rocksdb-util-murmurhash.patch b/0001-src-rocksdb-util-murmurhash.patch
new file mode 100644
index 0000000..f67a0ff
--- /dev/null
+++ b/0001-src-rocksdb-util-murmurhash.patch
@@ -0,0 +1,13 @@
+--- ceph-12.1.1.orig/src/rocksdb/util/murmurhash.cc	2017-04-27 01:13:46.000000000 +0100
++++ ceph-12.1.1.orig/src/rocksdb/util/murmurhash.cc	2017-07-25 11:37:28.910266684 +0100
+@@ -113,8 +113,8 @@ unsigned int MurmurHash2 ( const void *
+ 
+     switch(len)
+     {
+-    case 3: h ^= data[2] << 16;
+-    case 2: h ^= data[1] << 8;
++    case 3: h ^= data[2] << 16; // fallthrough
++    case 2: h ^= data[1] << 8; // fallthrough
+     case 1: h ^= data[0];
+         h *= m;
+     };
diff --git a/ceph.spec b/ceph.spec
index e57abd2..6f4e558 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -63,7 +63,7 @@
 #################################################################################
 Name:		ceph
 Version:	12.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		1
 %endif
@@ -78,6 +78,8 @@ Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
 Source0:	http://download.ceph.com/tarballs/ceph-12.1.1.tar.gz
+# https://bugzilla.redhat.com/show_bug.cgi?id=1474773
+Patch001:	0001-src-rocksdb-util-murmurhash.patch
 %if 0%{?suse_version}
 %if 0%{?is_opensuse}
 ExclusiveArch:	x86_64 aarch64 ppc64 ppc64le
@@ -85,7 +87,9 @@ ExclusiveArch:	x86_64 aarch64 ppc64 ppc64le
 ExclusiveArch:	x86_64 aarch64 ppc64le s390x
 %endif
 %else
-ExcludeArch:	i686 armv7hl ppc64
+# armv7hl https://bugzilla.redhat.com/show_bug.cgi?id=1474772
+#   ppc64 https://bugzilla.redhat.com/show_bug.cgi?id=1474774
+ExcludeArch:	armv7hl ppc64
 %endif
 #################################################################################
 # dependencies that apply across all distro families
@@ -1754,6 +1758,9 @@ exit 0
 
 
 %changelog
+* Sat Jul 22 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.1-2
+- 12.1.1 w/ rocksdb patch (i686), disable ceph_java (armv7hl)
+
 * Sat Jul 22 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.1-1
 - New release (1:12.1.1-1)