Accepting request 1073869 from home:AndreasStieger:branches:server:database

tweaks, tools

OBS-URL: https://build.opensuse.org/request/show/1073869
OBS-URL: https://build.opensuse.org/package/show/server:database/rocksdb?expand=0&rev=2

rocksdb-8.0.0-rpath.patch

@@ -0,0 +1,10 @@
+Index: rocksdb-8.0.0/tools/CMakeLists.txt
+===================================================================
+--- rocksdb-8.0.0.orig/tools/CMakeLists.txt
++++ rocksdb-8.0.0/tools/CMakeLists.txt
+@@ -1,3 +1,5 @@
++set(CMAKE_SKIP_BUILD_RPATH TRUE)
++
+ set(CORE_TOOLS
+   sst_dump.cc
+   ldb.cc)

rocksdb-8.0.0-shared-liburing.patch

@@ -0,0 +1,13 @@
+Index: rocksdb-8.0.0/cmake/modules/Finduring.cmake
+===================================================================
+--- rocksdb-8.0.0.orig/cmake/modules/Finduring.cmake
++++ rocksdb-8.0.0/cmake/modules/Finduring.cmake
+@@ -7,7 +7,7 @@
+ find_path(uring_INCLUDE_DIR
+   NAMES liburing.h)
+ find_library(uring_LIBRARIES
+-  NAMES liburing.a liburing)
++  NAMES liburing.so liburing)
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(uring

rocksdb.changes

@@ -1,8 +1,10 @@
 -------------------------------------------------------------------
-Tue Mar 21 20:40:00 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+Wed Mar 22 21:56:01 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
 
 - RocksDB 8.0.0
-- add rocksdb-8.0.0-reproducible.patch
+- add rocksdb-8.0.0-reproducible.patch - make build reproducible
+- add rocksdb-8.0.0-shared-liburing.patch - liburing dynamic linking
+- add rocksdb-8.0.0-rpath.patch
 
 -------------------------------------------------------------------
 Wed Oct 28 21:56:34 UTC 2020 - Adam Mizerski <adam@mizerski.pl>

rocksdb.spec

@@ -21,11 +21,13 @@
 Name:           rocksdb
 Version:        8.0.0
 Release:        0
-Summary:        RocksDB
+Summary:        A library that provides an embeddable, persistent key-value store for fast storage
 License:        Apache-2.0 AND GPL-2.0-only
 URL:            https://rocksdb.org/
 Source:         https://github.com/facebook/rocksdb/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:         rocksdb-8.0.0-reproducible.patch
+Patch1:         rocksdb-8.0.0-shared-liburing.patch
+Patch2:         rocksdb-8.0.0-rpath.patch
 BuildRequires:  c++_compiler
 BuildRequires:  cmake
 BuildRequires:  gflags-devel-static
@@ -35,6 +37,7 @@ BuildRequires:  cmake(gflags)
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(jemalloc)
 BuildRequires:  pkgconfig(liblz4)
+BuildRequires:  pkgconfig(liburing)
 BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(zlib)
 
@@ -59,6 +62,15 @@ data structure.
 
 This package holds the shared library of rocksdb.
 
+%package tools
+Summary:        Utility tools for RocksDB
+# MariaDB ships /usr/bin/sst_dump - MDEV-14918
+Conflicts:      mariadb
+
+%description tools
+RocksDB is a high performance embedded database for key-value data.
+This package contains utility tools for RocksDB.
+
 %package devel
 Summary:        Development package for RocksDB
 Requires:       %{lib_name} = %{version}
@@ -91,14 +103,18 @@ the RocksDB library.
     -DWITH_ZSTD=ON \
     -DWITH_BZ2=ON \
     -DWITH_TESTS=OFF \
+    -DWITH_TOOLS=OFF \
     -DWITH_BENCHMARK_TOOLS=OFF \
-    -DWITH_TOOLS=OFF
+    %{nil}
 
 %cmake_build
 
 %install
 %cmake_install
 find %{buildroot}%{_libdir} -type f -name "*.a" -print -delete
+install -dD -m 755 %{buildroot}/%{_bindir}
+install -m 755 build/tools/ldb %{buildroot}/%{_bindir}/ldb
+install -m 755 build/tools/sst_dump %{buildroot}/%{_bindir}/sst_dump
 
 %ldconfig_scriptlets -n %{lib_name}
 
@@ -106,6 +122,11 @@ find %{buildroot}%{_libdir} -type f -name "*.a" -print -delete
 %license COPYING LICENSE.Apache LICENSE.leveldb
 %{_libdir}/librocksdb.so.*
 
+%files tools
+%license COPYING LICENSE.Apache LICENSE.leveldb
+%{_bindir}/ldb
+%{_bindir}/sst_dump
+
 %files devel
 %license COPYING LICENSE.Apache LICENSE.leveldb
 %doc README.md HISTORY.md LANGUAGE-BINDINGS.md