From 0d4b48753776d315a38ef6cdca7002ccd1bfdcb5 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 5 Aug 2021 16:28:14 -0400
Subject: [PATCH] Rebuild for leveldb-1.23-3 w/ reverted -fno-rtti

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 0014-src-kv-LevelDBStore.cc.patch | 33 -------------------------------
 ceph.spec                         |  6 ++++--
 2 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 0014-src-kv-LevelDBStore.cc.patch

diff --git a/0014-src-kv-LevelDBStore.cc.patch b/0014-src-kv-LevelDBStore.cc.patch
deleted file mode 100644
index 2ae6ef1..0000000
--- a/0014-src-kv-LevelDBStore.cc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-*** ceph-16.2.5/src/kv/LevelDBStore.cc.orig	2021-08-03 10:24:53.176567077 -0400
---- ceph-16.2.5/src/kv/LevelDBStore.cc	2021-08-03 11:04:49.123548110 -0400
-***************
-*** 27,39 ****
-  using ceph::bufferlist;
-  using ceph::bufferptr;
-  
-  class CephLevelDBLogger : public leveldb::Logger {
-    CephContext *cct;
-  public:
-    explicit CephLevelDBLogger(CephContext *c) : cct(c) {
-      cct->get();
-    }
-!   ~CephLevelDBLogger() override {
-      cct->put();
-    }
-  
---- 27,41 ----
-  using ceph::bufferlist;
-  using ceph::bufferptr;
-  
-+ leveldb::Logger::~Logger() {}
-+ 
-  class CephLevelDBLogger : public leveldb::Logger {
-    CephContext *cct;
-  public:
-    explicit CephLevelDBLogger(CephContext *c) : cct(c) {
-      cct->get();
-    }
-!   virtual ~CephLevelDBLogger() override {
-      cct->put();
-    }
-  
diff --git a/ceph.spec b/ceph.spec
index 1e61cd8..0aa130c 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -126,7 +126,7 @@
 #################################################################################
 Name:		ceph
 Version:	16.2.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -153,7 +153,6 @@ Patch0009:	0009-librgw-notifications-initialize-kafka-and-amqp.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
-Patch0014:	0014-src-kv-LevelDBStore.cc.patch
 # Source1:	cmake-modules-BuildBoost.cmake.noautopatch
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
@@ -2502,6 +2501,9 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
+* Thu Aug 5 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.5-5
+- Rebuild for leveldb-1.23-3 w/ reverted -fno-rtti
+
 * Tue Aug 3 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.5-4
 - Rebuild for leveldb-1.23