From eca456f9d4bc8428b7046f0a32e87047a3ac5dd7 Mon Sep 17 00:00:00 2001
From: Jonny Heggheim <hegjon@gmail.com>
Date: Feb 24 2022 17:57:59 +0000
Subject: Updated to version 6.29.3


---

diff --git a/rocksdb.spec b/rocksdb.spec
index 4f206e9..b9eca7d 100644
--- a/rocksdb.spec
+++ b/rocksdb.spec
@@ -1,8 +1,8 @@
 %global forgeurl https://github.com/facebook/rocksdb
 
 Name:    rocksdb
-Version: 6.26.1
-Release: 2%{?dist}
+Version: 6.29.3
+Release: 1%{?dist}
 Summary: A Persistent Key-Value Store for Flash and RAM Storage
 
 License: GPLv2 or ASL 2.0 and BSD
@@ -37,10 +37,6 @@ Source: %{forgesource}
 # https://github.com/facebook/rocksdb/issues/8021
 Patch0: gcc-c++-false-positive-warning.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1997426
-# https://github.com/facebook/rocksdb/issues/8698
-Patch1: toku_time-s390x.patch
-
 %description
 RocksDB is a library that forms the core building block for a fast key value
 server, especially suited for storing data on flash drives. It has a
@@ -61,7 +57,6 @@ Development files for rocksdb.
 %forgesetup
 
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{set_build_flags}
@@ -76,8 +71,8 @@ make install-shared PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot}
 %license LICENSE.Apache
 %license LICENSE.leveldb
 %{_libdir}/librocksdb.so.6
-%{_libdir}/librocksdb.so.6.26
-%{_libdir}/librocksdb.so.6.26.1
+%{_libdir}/librocksdb.so.6.29
+%{_libdir}/librocksdb.so.6.29.3
 
 
 %files devel
@@ -90,6 +85,9 @@ make install-shared PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot}
 %{_includedir}/rocksdb
 
 %changelog
+* Thu Feb 24 2022 Jonny Heggheim <hegjon@gmail.com> - 6.29.3-1
+- Updated to version 6.29.3
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.26.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/toku_time-s390x.patch b/toku_time-s390x.patch
deleted file mode 100644
index 5a12a5b..0000000
--- a/toku_time-s390x.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3013350e2ddc35715ab353bf9f129f241233410c Mon Sep 17 00:00:00 2001
-From: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
-Date: Tue, 24 Aug 2021 17:07:44 +0530
-Subject: [PATCH] Add support for s390x platform in toku_time
-
-Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
----
-https://bugzilla.redhat.com/show_bug.cgi?id=1997426
-
- .../lock/range/range_tree/lib/portability/toku_time.h         | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-index 4425a4a2e57..225e3fa7211 100644
---- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-+++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-@@ -133,6 +133,10 @@ static inline tokutime_t toku_time_now(void) {
-   return result;
- #elif defined(__powerpc__)
-   return __ppc_get_timebase();
-+#elif defined(__s390x__)
-+  uint64_t result;
-+  asm volatile("stckf %0" : "=Q"(result) : : "cc");
-+  return result;
- #else
- #error No timer implementation for this platform
- #endif