rebuild with libarrow-23.0.1, cmake-4, system zstd

unclear why smp_helpers.h inclusion of <crimson/common/coroutine.h is
not including <coroutine.h>, thus necessitating the patch

0029-src-rgw-rgw_amqp.cc.patch

@@ -0,0 +1,17 @@
+--- ceph-18.0.0-2726-g7cea3740/src/rgw/rgw_amqp.cc.orig	2023-03-14 18:22:35.636864260 -0400
++++ ceph-18.0.0-2726-g7cea3740/src/rgw/rgw_amqp.cc	2023-03-14 18:24:36.362756771 -0400
+@@ -2,10 +2,10 @@
+ // vim: ts=8 sw=2 smarttab ft=cpp
+ 
+ #include "rgw_amqp.h"
+-#include <amqp.h>
+-#include <amqp_ssl_socket.h>
+-#include <amqp_tcp_socket.h>
+-#include <amqp_framing.h>
++#include <rabbitmq-c/amqp.h>
++#include <rabbitmq-c/ssl_socket.h>
++#include <rabbitmq-c/tcp_socket.h>
++#include <rabbitmq-c/framing.h>
+ #include "include/ceph_assert.h"
+ #include <sstream>
+ #include <cstring>

0040-gcc-14.patch

@@ -1,41 +0,0 @@
-From f5d3e9146d9ceb12858bc94d60090bd851b1c088 Mon Sep 17 00:00:00 2001
-From: Adam Emerson <aemerson@redhat.com>
-Date: Wed, 20 Dec 2023 13:51:21 -0500
-Subject: [PATCH] test/neorados: Use two fewer GTest internals
-
-To get coroutine tests working, I used some internals. Two of these
-are no longer available in newer versions. Since they can be
-implemented with regular old C++ features, use those.
-
-This fixes an FTBFS on Fedora Rawhide introduced in
-`35231f7251ed70d8d817ee7e727d9763669d101f`.
-
-Signed-off-by: Adam Emerson <aemerson@redhat.com>
----
- src/test/neorados/common_tests.h | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/test/neorados/common_tests.h b/src/test/neorados/common_tests.h
-index 9610f08f643f3..396432e417e84 100644
---- a/src/test/neorados/common_tests.h
-+++ b/src/test/neorados/common_tests.h
-@@ -391,10 +391,14 @@ class NeoRadosECTest : public NeoRadosTestBase {
-   public:                                                                      \
-     GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() = default;            \
-     ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default;  \
--    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
--							   test_name));        \
--    GTEST_DISALLOW_MOVE_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
--							   test_name));        \
-+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)(			       \
-+      const GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)&) = delete;     \
-+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)& operator =(	       \
-+      const GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)&) = delete;     \
-+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)(			       \
-+      GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)&&) = delete;	       \
-+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)& operator =(	       \
-+      GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)&&) = delete;	       \
- 									       \
-   private:                                                                     \
-     boost::asio::awaitable<void> CoTestBody() override;                        \
-

0041-src-boost-boost-python-call_method.hpp.patch

@@ -0,0 +1,11 @@
+--- ceph-18.2.3/src/boost/boost/python/call_method.hpp.orig	2024-06-07 11:14:58.579734749 -0400
++++ ceph-18.2.3/src/boost/boost/python/call_method.hpp	2024-06-07 11:19:06.754520504 -0400
+@@ -59,7 +59,7 @@
+     )
+ {
+     PyObject* const result = 
+-        PyEval_CallMethod(
++        PyObject_CallMethod(
+             self
+             , const_cast<char*>(name)
+             , const_cast<char*>("(" BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FIXED, "O") ")")

0051-src-googletest-nosharedlibs.patch

@@ -0,0 +1,63 @@
+--- ceph-20.1.0/src/googletest/googletest/CMakeLists.txt.orig	2025-02-07 11:04:56.000000000 -0500
++++ ceph-20.1.0/src/googletest/googletest/CMakeLists.txt	2025-09-16 08:11:59.341951770 -0400
+@@ -53,6 +53,8 @@
+   set_up_hermetic_build()
+ endif()
+ 
++option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
++
+ # These commands only run if this is the main project.
+ if(CMAKE_PROJECT_NAME STREQUAL "gtest" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
+ 
+@@ -121,7 +123,7 @@
+ # are used for other targets, to ensure that gtest can be compiled by a user
+ # aggressive about warnings.
+ cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
+-set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
++#set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
+ if(GTEST_HAS_ABSL)
+   target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
+   target_link_libraries(gtest PUBLIC
+@@ -139,7 +141,7 @@
+   )
+ endif()
+ cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
+-set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
++#set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
+ string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
+ target_include_directories(gtest SYSTEM INTERFACE
+   "$<BUILD_INTERFACE:${dirs}>"
+--- ceph-20.1.0/src/googletest/googlemock/CMakeLists.txt.orig	2025-02-07 11:04:56.000000000 -0500
++++ ceph-20.1.0/src/googletest/googlemock/CMakeLists.txt	2025-09-16 08:12:18.121641875 -0400
+@@ -49,6 +49,7 @@
+ # if they are the same (the default).
+ add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/${gtest_dir}")
+ 
++option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+ 
+ # These commands only run if this is the main project
+ if(CMAKE_PROJECT_NAME STREQUAL "gmock" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
+@@ -96,10 +97,10 @@
+ else()
+   cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
+   target_link_libraries(gmock PUBLIC gtest)
+-  set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION})
++  # set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION})
+   cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
+   target_link_libraries(gmock_main PUBLIC gmock)
+-  set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
++  # set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
+ endif()
+ 
+ string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
+--- ceph-20.1.0/src/googletest/googletest/cmake/internal_utils.cmake.orig	2025-09-22 10:12:18.037349494 -0400
++++ ceph-20.1.0/src/googletest/googletest/cmake/internal_utils.cmake	2025-09-22 10:13:13.729590249 -0400
+@@ -207,7 +207,7 @@
+ endfunction()
+ 
+ function(cxx_library name cxx_flags)
+-  cxx_library_with_type(${name} "" "${cxx_flags}" ${ARGN})
++  cxx_library_with_type(${name} STATIC "${cxx_flags}" ${ARGN})
+ endfunction()
+ 
+ # cxx_executable_with_flags(name cxx_flags libs srcs...)

0052-src-tracing.patch

@@ -0,0 +1,11 @@
+--- ceph-19.2.0/src/tracing/CMakeLists.txt.orig	2025-01-23 17:51:43.874162594 -0500
++++ ceph-19.2.0/src/tracing/CMakeLists.txt	2025-01-23 17:54:21.877186735 -0500
+@@ -6,6 +6,8 @@
+ set(header_dir ${working_dir}/tracing)
+ file(MAKE_DIRECTORY ${header_dir})
+ 
++set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu23")
++
+ add_custom_target(tracepoint_libraries)
+ 
+ file(GLOB tps "*.tp")

0053-src-test-neorados-common_tests.h.patch

@@ -0,0 +1,21 @@
+--- ceph-20.1.0/src/test/neorados/common_tests.h.orig	2025-09-04 15:35:40.000000000 -0400
++++ ceph-20.1.0/src/test/neorados/common_tests.h	2025-09-16 08:13:03.274896767 -0400
+@@ -47,6 +47,18 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#if !defined(GTEST_DISALLOW_COPY_AND_ASSIGN_)
++#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
++  type(type const&) = delete;                 \
++  type& operator=(type const&) = delete
++#endif
++
++#if !defined(GTEST_DISALLOW_MOVE_AND_ASSIGN_)
++#define GTEST_DISALLOW_MOVE_AND_ASSIGN_(type) \
++  type(type&&) noexcept = delete;             \
++  type& operator=(type&&) noexcept = delete
++#endif
++
+ /// \file test/neorados/common_tests.h
+ ///
+ /// \brief Tools for testing neorados code

0057-src-json_spirit-json_spirit_reader_template.h.patch

@@ -0,0 +1,10 @@
+--- ceph-20.0.0-2099-gc62cbb7d/src/json_spirit/json_spirit_reader_template.h.orig	2025-06-09 11:56:21.534808695 -0400
++++ ceph-20.0.0-2099-gc62cbb7d/src/json_spirit/json_spirit_reader_template.h	2025-06-09 12:01:56.358334353 -0400
+@@ -136,6 +136,7 @@
+     {
+         typedef typename String_type::const_iterator Iter_type;
+ 
++        if( end - begin < 1 ) return String_type();
+         if( end - begin < 2 ) return String_type( begin, end );
+ 
+         String_type result;

0058-src-CMakeLists.txt.patch

@@ -0,0 +1,13 @@
+--- ceph-20.2.0/src/CMakeLists.txt.orig	2026-01-20 14:31:56.764231793 -0500
++++ ceph-20.2.0/src/CMakeLists.txt	2026-01-20 14:35:21.258787691 -0500
+@@ -1051,8 +1051,8 @@
+ if(WITH_RADOSGW)
+   if(WITH_RADOSGW_SELECT_PARQUET OR WITH_RADOSGW_ARROW_FLIGHT)
+     if(WITH_SYSTEM_ARROW)
+-      find_package(Arrow 4 REQUIRED QUIET)
+-      find_package(Parquet 4 REQUIRED QUIET)
++      find_package(Arrow REQUIRED QUIET)
++      find_package(Parquet REQUIRED QUIET)
+     else()
+       # find arrow's dependencies
+       if (WITH_SYSTEM_UTF8PROC)

0059-iso646.patch

@@ -0,0 +1,11 @@
+--- ceph-20.0.0-2787-g838ba95e/src/jaegertracing/opentelemetry-cpp/api/include/opentelemetry/nostd/internal/absl/base/options.h.orig	2025-07-31 10:18:56.636528168 -0400
++++ ceph-20.0.0-2787-g838ba95e/src/jaegertracing/opentelemetry-cpp/api/include/opentelemetry/nostd/internal/absl/base/options.h	2025-07-31 10:19:12.923329646 -0400
+@@ -70,7 +70,7 @@
+ // Include a standard library header to allow configuration based on the
+ // standard library in use.
+ #ifdef __cplusplus
+-#include <ciso646>
++#include <iso646.h>
+ #endif
+ 
+ // -----------------------------------------------------------------------------

0062-src-rgw-driver-dbstore-CMakeLists.txt.patch

@@ -0,0 +1,11 @@
+--- ceph-20.2.0/src/rgw/driver/dbstore/CMakeLists.txt.orig	2026-01-27 19:53:53.780108462 -0500
++++ ceph-20.2.0/src/rgw/driver/dbstore/CMakeLists.txt	2026-01-28 07:30:04.861741687 -0500
+@@ -34,7 +34,7 @@
+   list(APPEND link_targets jaeger_base)
+ endif()
+ list(APPEND link_targets rgw_common)
+-target_link_libraries(dbstore_lib PUBLIC ${link_targets})
++target_link_libraries(dbstore_lib PUBLIC ${link_targets} PRIVATE rgw_a)
+ 
+ set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} dbstore_lib)
+ 

0063-src-jaegertracing-opentelemetry-cpp-CMakeLists.txt.patch

@@ -0,0 +1,8 @@
+--- ceph-20.2.0/src/jaegertracing/opentelemetry-cpp/CMakeLists.txt.orig	2026-02-17 08:17:06.372917033 -0500
++++ ceph-20.2.0/src/jaegertracing/opentelemetry-cpp/CMakeLists.txt	2026-02-17 08:17:44.026323618 -0500
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # See https://cmake.org/cmake/help/v3.3/policy/CMP0057.html required by certain
+ # versions of gtest

ceph.spec

@@ -20,47 +20,15 @@
 # please read this for explanation of bcond syntax:
 # https://rpm-software-management.github.io/rpm/manual/conditionalbuilds.html
 #################################################################################
-%bcond_with server
-
-%if %{without server}
-
+%bcond_with system_boost
 %bcond_with make_check
 %bcond_with cmake_verbose_logging
-%bcond_with ceph_test_package
-%bcond_with tcmalloc
-%bcond_with radosgw
-%bcond_with rbd_ssd_cache
-%bcond_with rbd_rwl_cache
-%bcond_with system_pmdk
-%bcond_with selinux
-%bcond_with amqp_endpoint
-%bcond_with kafka_endpoint
-%bcond_with lttng
-%bcond_without libradosstriper
-%bcond_with ocf
-%global luarocks_package_name luarocks
-%bcond_with lua_packages
-%global _remote_tarball_prefix https://download.ceph.com/tarballs/
-%bcond_with seastar
-%bcond_with jaeger
-%bcond_with cephfs_java
-%bcond_with cephfs_shell
-%bcond_with system_arrow
-%bcond_with system_utf8proc
-%bcond_with grpc
-
-%else
-
-%bcond_with make_check
-%bcond_with zbd
-%bcond_with cmake_verbose_logging
 %bcond_without ceph_test_package
 %ifarch s390
 %bcond_with tcmalloc
 %else
 %bcond_without tcmalloc
 %endif
-%bcond_without radosgw
 %bcond_without rbd_ssd_cache
 %ifarch x86_64
 %bcond_without rbd_rwl_cache
@@ -120,13 +88,12 @@
 %bcond_with lua_packages
 %endif
 %endif
-%bcond_without crimson
+%bcond_with crimson
 %if 0%{?suse_version}
 %bcond_with jaeger
 %else
 %bcond_without jaeger
 %endif
-%bcond_without grpc
 %if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel}
 # distros that ship cmd2 and/or colorama
 %bcond_without cephfs_shell
@@ -158,7 +125,6 @@
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %global weak_deps 1
 %endif
-%endif
 %if %{with selinux}
 # get selinux policy version
 # Force 0.0.0 policy version for centos builds to avoid repository sync issues between rhel and centos
@@ -191,23 +157,16 @@
 %global _binary_payload w7T%{_smp_build_ncpus}.xzdio
 %endif
 
-%define smp_limit_mem_per_job() %( \
-  kb_per_job=%1 \
-  kb_total=$(head -3 /proc/meminfo | sed -n 's/MemAvailable:\\s*\\(.*\\) kB.*/\\1/p') \
-  jobs=$(( $kb_total / $kb_per_job )) \
-  [ $jobs -lt 1 ] && jobs=1 \
-  echo $jobs )
-
 %if 0%{?_smp_ncpus_max} == 0
 %if 0%{?__isa_bits} == 32
 # 32-bit builds can use 3G memory max, which is not enough even for -j2
 %global _smp_ncpus_max 1
 %else
 # 3.0 GiB mem per job
-# SUSE distros use limit_build in the place of smp_limit_mem_per_job, please
+# SUSE distros still use limit_build in the place of _smp_tasksize_proc, please
 # be sure to update it (in the build section, below) as well when changing this
 # number.
-%global _smp_ncpus_max %{smp_limit_mem_per_job 3000000}
+%global _smp_tasksize_proc 3000
 %endif
 %endif
 
@@ -215,16 +174,13 @@
 # do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but
 # redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
 %undefine _annotated_build
-%if 0%{?rhel} == 8 && 0%{?enable_devtoolset11:1}
-%enable_devtoolset11
-%endif
 
 #################################################################################
 # main package definition
 #################################################################################
 Name:		ceph
 Version:	20.2.0
-Release:	5%{?dist}
+Release:	9%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -239,14 +195,14 @@ License:	LGPL-2.1-or-later AND LGPL-3.0-only AND CC-BY-SA-3.0 AND GPL-2.0-only A
 Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
-Source0:	https://download.ceph.com/tarballs/ceph-%{version}.tar.gz
+Source:		https://download.ceph.com/tarballs/ceph-%{version}.tar.gz
 #Source0:	https://1.chacra.ceph.com/r/ceph/tentacle/
 Patch:		0001-src-common-crc32c_intel_fast.patch
 Patch:		0003-src-common-bitstr.h.patch
 Patch:		0010-CET-Add-CET-marker-to-crc32c_intel_fast_zero_asm.s.patch
 Patch:		0011-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assembly-co.patch
 Patch:		0012-spdk-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assemb.patch
-Patch:		0016-src-tracing-patch
+Patch:		0016-src-tracing.patch
 Patch:		0018-src-rgw-store-dbstore-CMakeLists.txt.patch
 Patch:		0024-gcc-13.patch
 Patch:		0032-cmake-modules-BuildBoost.cmake.patch
@@ -256,8 +212,16 @@ Patch:		0041-src-mgr-PyModule.cc.patch
 Patch:		0043_src_common_crc32c_ppc_asm.S.patch
 Patch:		0047-openssl-no-engine.patch
 Patch:		0049-src-rocksdb-db-blob-blob_file_meta.h.patch
+Patch:		0051-src-googletest-nosharedlibs.patch
+Patch:		0052-src-tracing.patch
+Patch:		0053-src-test-neorados-common_tests.h.patch
 Patch:		0056-libarrow-20.0.0.patch
+Patch:		0057-src-json_spirit-json_spirit_reader_template.h.patch
+Patch:		0058-src-CMakeLists.txt.patch
+Patch:		0059-iso646.patch
 Patch:		0061-gcc-16.patch
+Patch:		0062-src-rgw-driver-dbstore-CMakeLists.txt.patch
+Patch:		0063-src-jaegertracing-opentelemetry-cpp-CMakeLists.txt.patch
 
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
@@ -273,6 +237,11 @@ Requires:	ceph-mds = %{_epoch_prefix}%{version}-%{release}
 Requires:	ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:	ceph-mon = %{_epoch_prefix}%{version}-%{release}
 Requires(post):	binutils
+%if 0%{?suse_version}
+Requires(pre):	/usr/sbin/useradd
+Requires(pre):	/usr/sbin/groupadd
+%endif
+
 %if 0%{with cephfs_java}
 BuildRequires:	java-devel
 BuildRequires:	jpackage-utils
@@ -285,17 +254,13 @@ BuildRequires:	selinux-policy-devel
 BuildRequires:	gperf
 BuildRequires:	cmake > 3.5
 BuildRequires:	fuse3-devel
-%if 0%{with grpc}
 BuildRequires:	grpc-devel
-%endif
 BuildRequires:	gcc-c++
 BuildRequires:	libzstd-devel
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	libatomic
-%ifarch x86_64 aarch64
-%bcond_with ld_mold
-%else
-%bcond_with ld_mold
 %endif
+%bcond_without ld_mold
 %if 0%{with ld_mold}
 BuildRequires:	mold
 %endif
@@ -316,16 +281,14 @@ BuildRequires:	libcurl-devel
 BuildRequires:	libcap-devel
 BuildRequires:	libcap-ng-devel
 #BuildRequires:	fmt-devel >= 6.2.1
-%if ! (0%{?fedora} || 0%{?rhel} >= 10)
-BuildRequires:	rocksdb-devel
-Requires:	rocksdb
-%endif
+#%if ( 0%%{?fedora} || 0%%{?rhel} >= 10 )
+#BuildRequires:	rocksdb-devel
+#Requires:	rocksdb
+#%endif
 BuildRequires:	liburing-devel
 BuildRequires:	pkgconfig(libudev)
 BuildRequires:	libnl3-devel
-%if 0%{?with radosgw}
 BuildRequires:	liboath-devel
-%endif
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
@@ -378,13 +341,12 @@ BuildRequires:	socat
 BuildRequires:	python%{python3_pkgversion}-asyncssh
 BuildRequires:	python%{python3_pkgversion}-natsort
 %endif
-%if 0%{with jaeger} || 0%{with radosgw}
 %if 0%{?suse_version}
 BuildRequires:	libthrift-devel >= 0.13.0
 %else
 BuildRequires:	thrift-devel >= 0.13.0
 %endif
-%endif
+BuildRequires:	re2-devel
 %if 0%{with jaeger}
 BuildRequires:	bison
 BuildRequires:	flex
@@ -410,10 +372,8 @@ BuildRequires:	libpmemobj-devel >= 1.8
 BuildRequires:	libarrow-devel
 BuildRequires:	parquet-libs-devel
 %else
-%if 0%{with server}
 BuildRequires: xsimd-devel
 %endif
-%endif
 %if 0%{with system_utf8proc}
 BuildRequires:	utf8proc-devel
 %endif
@@ -465,7 +425,10 @@ BuildRequires:	jsonnet
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 Requires:	systemd
+%if 0%{with system_boost}
 BuildRequires:	boost-random
+BuildRequires:	boost-url
+%endif
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
 BuildRequires:	libatomic
@@ -554,8 +517,6 @@ on commodity hardware and delivers object, block and file system storage.
 #################################################################################
 # subpackages
 #################################################################################
-%if %{with server}
-
 %package base
 Summary:	Ceph Base Package
 %if 0%{?suse_version}
@@ -617,8 +578,6 @@ Requires:	python%{python3_pkgversion}-pyyaml
 Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed
 with systemd and podman.
 
-%endif
-
 %package common
 Summary:	Ceph Common
 %if 0%{?suse_version}
@@ -652,8 +611,6 @@ Provides:	user(ceph)
 Common utilities to mount and interact with a ceph storage cluster.
 Comprised of files that are common to Ceph clients and servers.
 
-%if %{with server}
-
 %package mds
 Summary:	Ceph Metadata Server Daemon
 %if 0%{?suse_version}
@@ -1004,15 +961,12 @@ Requires:	parted
 Requires:	util-linux
 Requires:	xfsprogs
 Requires:	python%{python3_pkgversion}-setuptools
-Requires:	python%{python3_pkgversion}-packaging
 Requires:	python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
 %description volume
 This package contains a tool to deploy OSD with different devices like
 lvm or physical disks, and trying to follow a predictable, and robust
 way of preparing, activating, and starting the deployed OSD.
 
-%endif
-
 %package -n librados2
 Summary:	RADOS distributed object store client library
 %if 0%{?suse_version}
@@ -1051,8 +1005,6 @@ Requires:	librados-devel = %{_epoch_prefix}%{version}-%{release}
 This package contains C++ libraries and headers needed to develop programs
 that use RADOS object store.
 
-%if %{with radosgw}
-
 %package -n librgw2
 Summary:	RADOS gateway client library
 %if 0%{?suse_version}
@@ -1090,8 +1042,6 @@ Obsoletes:	python-rgw < %{_epoch_prefix}%{version}-%{release}
 This package contains Python 3 libraries for interacting with Ceph RADOS
 gateway.
 
-%endif
-
 %package -n python%{python3_pkgversion}-rados
 Summary:	Python 3 libraries for the RADOS object store
 %if 0%{?suse_version}
@@ -1324,6 +1274,8 @@ Requires:	ceph-common = %{_epoch_prefix}%{version}-%{release}
 Requires:	xmlstarlet
 Requires:	jq
 Requires:	socat
+BuildRequires:	gtest-devel
+BuildRequires:	gmock-devel
 %description -n ceph-test
 This package contains Ceph benchmarks and test tools.
 %endif
@@ -1398,8 +1350,6 @@ populated file-systems.
 
 %endif
 
-%if %{with server}
-
 %package grafana-dashboards
 Summary:	The set of Grafana dashboards for monitoring purposes
 BuildArch:	noarch
@@ -1437,14 +1387,14 @@ Group:		System/Monitoring
 %endif
 %description node-proxy
 This package provides a Ceph hardware monitoring agent.
-%endif
 
 #################################################################################
 # common
 #################################################################################
 %prep
 %autosetup -p1
-# Create two sysusers.d config files  
+
+# Create two sysusers.d config files
 cat >ceph.sysusers.conf <<EOF
 g ceph 167
 u ceph 167 'Ceph storage service' %{_localstatedir}/lib/ceph -
@@ -1496,11 +1446,6 @@ env | sort
 %if 0%{?suse_version}
     -DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF \
 %endif
-%if 0%{?with grpc}
-    -DWITH_NVMEOF_GATEWAY_MONITOR_CLIENT:BOOL=ON \
-%else
-    -DWITH_NVMEOF_GATEWAY_MONITOR_CLIENT:BOOL=OFF \
-%endif
 %if 0%{without ceph_test_package}
     -DWITH_TESTS:BOOL=OFF \
 %endif
@@ -1528,7 +1473,11 @@ env | sort
     -DWITH_SYSTEM_ROCKSDB:BOOL=OFF \
 %endif
     -DWITH_SYSTEM_LIBURING:BOOL=ON \
+%if 0%{with system_boost}
+    -DWITH_SYSTEM_BOOST:BOOL=ON \
+%else
     -DWITH_SYSTEM_BOOST:BOOL=OFF \
+%endif
 %if 0%{with cephfs_shell}
     -DWITH_CEPHFS_SHELL:BOOL=ON \
 %endif
@@ -1537,9 +1486,6 @@ env | sort
 %else
     -DWITH_LIBRADOSSTRIPER:BOOL=OFF \
 %endif
-%if 0%{without radosgw}
-    -DWITH_RADOSGW:BOOL=OFF \
-%endif
 %if 0%{with amqp_endpoint}
     -DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=ON \
 %else
@@ -1568,16 +1514,19 @@ env | sort
 %if 0%{without jaeger}
     -DWITH_JAEGER:BOOL=OFF \
 %endif
+%if 0%{?suse_version}
+    -DBOOST_J:STRING=%{jobs} \
+%else
+    -DBOOST_J:STRING=%{_smp_build_ncpus} \
+%endif
 %if 0%{?fedora} || 0%{?rhel}
     -DWITH_FMT_HEADER_ONLY:BOOL=ON \
 %endif
 %if 0%{with system_arrow}
     -DWITH_SYSTEM_ARROW:BOOL=ON \
 %else
-%if 0%{with server}
     -Dxsimd_SOURCE="SYSTEM" \
 %endif
-%endif
 %if 0%{with system_utf8proc}
     -DWITH_SYSTEM_UTF8PROC:BOOL=ON \
 %endif
@@ -1607,29 +1556,12 @@ env | sort
 %endif
 %if 0%{with cephadm_bundling}
 %if 0%{with cephadm_pip_deps}
-    -DCEPHADM_BUNDLED_DEPENDENCIES=pip \
+    -DCEPHADM_BUNDLED_DEPENDENCIES=pip
 %else
-    -DCEPHADM_BUNDLED_DEPENDENCIES=rpm \
+    -DCEPHADM_BUNDLED_DEPENDENCIES=rpm
 %endif
 %else
-    -DCEPHADM_BUNDLED_DEPENDENCIES=none \
-%endif
-%if 0%{?suse_version}
-    -DBOOST_J:STRING=%{jobs} \
-%else
-    -DBOOST_J:STRING=%{_smp_build_ncpus} \
-%endif
-%if 0%{with server}
-    -DWITH_GRAFANA:BOOL=ON
-%else
-    -DWITH_MGR:BOOL=OFF \
-    -DWITH_EMBEDDED:BOOL=OFF \
-    -DWITH_SYSTEMD:BOOL=ON \
-    -DWITH_SPDK:BOOL=OFF \
-    -DWITH_PMEM:BOOL=OFF \
-    -DWITH_BOOST_CONTEXT:BOOL=OFF \
-    -DWITH_LEVELDB:BOOL=OFF \
-    -DWITH_GRAFANA:BOOL=OFF
+    -DCEPHADM_BUNDLED_DEPENDENCIES=none
 %endif
 
 %if %{with cmake_verbose_logging}
@@ -1660,33 +1592,30 @@ install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-o
 %endif
 
 install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
-install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
-chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
-install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
-
-%if %{with server}
-
 %if 0%{?fedora} || 0%{?rhel}
 install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
 %endif
 %if 0%{?suse_version}
 install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name}
 %endif
+install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
 install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_presetdir}/50-ceph.preset
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
+chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
+install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
 install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
 install -m 0755 -D src/tools/rbd_nbd/rbd-nbd_quiesce %{buildroot}%{_libexecdir}/rbd-nbd/rbd-nbd_quiesce
+
+install -m 0644 -D ceph.sysusers.conf %{buildroot}%{_sysusersdir}/ceph.conf
 install -m 0644 -D cephadm.sysusers.conf %{buildroot}%{_sysusersdir}/cephadm.conf
+
 mkdir -p %{buildroot}%{_sharedstatedir}/cephadm
 chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm
 mkdir -p %{buildroot}%{_sharedstatedir}/cephadm/.ssh
 chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm/.ssh
 touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
 chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
-%endif
-
-install -m 0644 -D ceph.sysusers.conf %{buildroot}%{_sysusersdir}/ceph.conf
 
 # firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version} && 0%{?suse_version} < 1550
@@ -1697,10 +1626,8 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
 # udev rules
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
 
-%if 0%{with server}
 # sudoers.d
 install -m 0440 -D sudoers.d/ceph-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-smartctl
-%endif
 
 %py3_shebang_fix %{buildroot}%{_bindir}/* %{buildroot}%{_sbindir}/*
 
@@ -1708,10 +1635,6 @@ install -m 0440 -D sudoers.d/ceph-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/
 mkdir -p %{buildroot}%{_sysconfdir}/ceph
 mkdir -p %{buildroot}%{_localstatedir}/run/ceph
 mkdir -p %{buildroot}%{_localstatedir}/log/ceph
-mkdir -p %{buildroot}%{_localstatedir}/lib/ceph
-
-%if 0%{with server}
-
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/tmp
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mon
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/osd
@@ -1736,125 +1659,8 @@ install -m 644 -D monitoring/ceph-mixin/dashboards_out/* %{buildroot}/etc/grafan
 # SNMP MIB
 install -m 644 -D -t %{buildroot}%{_datadir}/snmp/mibs monitoring/snmp/CEPH-MIB.txt
 
-%else
-
-# Remove the rbd/fuse bits
-rm -f %{buildroot}%{_bindir}/ceph-fuse
-rm -f %{buildroot}%{_mandir}/man8/ceph-fuse.8*
-rm -f %{buildroot}%{_sbindir}/mount.fuse.ceph
-rm -f %{buildroot}%{_mandir}/man8/mount.fuse.ceph.8*
-rm -f %{buildroot}%{_unitdir}/ceph-fuse@.service
-rm -f %{buildroot}%{_unitdir}/ceph-fuse.target
-rm -f %{buildroot}%{_bindir}/rbd-fuse
-rm -f %{buildroot}%{_mandir}/man8/rbd-fuse.8*
-
-# Remove the ceph-base package
-rm -f %{buildroot}%{_bindir}/ceph-crash
-rm -f %{buildroot}%{_bindir}/crushtool
-rm -f %{buildroot}%{_bindir}/monmaptool
-rm -f %{buildroot}%{_bindir}/osdmaptool
-rm -f %{buildroot}%{_bindir}/ceph-kvstore-tool
-rm -f %{buildroot}%{_bindir}/ceph-run
-rm -f %{buildroot}%{_exec_prefix}/sbin/ceph-create-keys
-rm -f %{buildroot}%{_sbindir}/ceph-volume
-rm -f %{buildroot}%{_sbindir}/ceph-volume-systemd
-rm -f %{buildroot}%{_libexecdir}/ceph/ceph_common.sh
-rm -rf %{buildroot}%{_libdir}/rados-classes
-rm -rf %{buildroot}%{_libdir}/ceph/erasure-code
-rm -rf %{buildroot}%{_libdir}/ceph/extblkdev
-rm -rf %{buildroot}%{_libdir}/ceph/compressor
-rm -rf %{buildroot}%{_libdir}/ceph/crypto
-rm -f %{buildroot}%{_unitdir}/ceph-crash.service
-rm -f %{buildroot}%{_unitdir}/ceph-volume@.service
-rm -f %{buildroot}%{_unitdir}/ceph.target
-rm -rf %{buildroot}%{python3_sitelib}/ceph_volume/*
-rm -rf %{buildroot}%{python3_sitelib}/ceph_volume-*
-rm -f %{buildroot}%{_mandir}/man8/ceph-deploy.8*
-rm -f %{buildroot}%{_mandir}/man8/ceph-create-keys.8*
-rm -f %{buildroot}%{_mandir}/man8/ceph-volume.8*
-rm -f %{buildroot}%{_mandir}/man8/ceph-volume-systemd.8*
-rm -f %{buildroot}%{_mandir}/man8/ceph-run.8*
-rm -f %{buildroot}%{_mandir}/man8/crushtool.8*
-rm -f %{buildroot}%{_mandir}/man8/osdmaptool.8*
-rm -f %{buildroot}%{_mandir}/man8/monmaptool.8*
-rm -f %{buildroot}%{_mandir}/man8/ceph-kvstore-tool.8*
-
-# Remove the ceph-mds package
-rm -f %{buildroot}%{_bindir}/ceph-mds
-rm -f %{buildroot}%{_mandir}/man8/ceph-mds.8*
-rm -f %{buildroot}%{_unitdir}/ceph-mds@.service
-rm -f %{buildroot}%{_unitdir}/ceph-mds.target
-
-# Remove the ceph-mgr package
-rm -f %{buildroot}%{_unitdir}/ceph-mgr@.service
-rm -f %{buildroot}%{_unitdir}/ceph-mgr.target
-
-# Remove the ceph-mon package
-rm -f %{buildroot}%{_bindir}/ceph-mon
-rm -f %{buildroot}%{_bindir}/ceph-monstore-tool
-rm -f %{buildroot}%{_mandir}/man8/ceph-mon.8*
-rm -f %{buildroot}%{_unitdir}/ceph-mon@.service
-rm -f %{buildroot}%{_unitdir}/ceph-mon.target
-
-# Remove the ceph-mon-client-nvmeof package
-rm -f %{buildroot}%{_bindir}/ceph-nvmeof-monitor-client
-
-# Remove the ceph-radosgw package
-rm -f %{buildroot}%{_unitdir}/ceph-radosgw@.service
-rm -f %{buildroot}%{_unitdir}/ceph-radosgw.target
-
-# Remove the ceph-osd package
-rm -f %{buildroot}%{_bindir}/ceph-clsinfo
-rm -f %{buildroot}%{_bindir}/ceph-bluestore-tool
-rm -f %{buildroot}%{_bindir}/ceph-erasure-code-tool
-rm -f %{buildroot}%{_bindir}/ceph-objectstore-tool
-rm -f %{buildroot}%{_bindir}/ceph-osdomap-tool
-rm -f %{buildroot}%{_bindir}/ceph-osd
-rm -f %{buildroot}%{_libexecdir}/ceph/ceph-osd-prestart.sh
-rm -f %{buildroot}%{_mandir}/man8/ceph-clsinfo.8*
-rm -f %{buildroot}%{_mandir}/man8/ceph-osd.8*
-rm -f %{buildroot}%{_mandir}/man8/ceph-bluestore-tool.8*
-rm -f %{buildroot}%{_unitdir}/ceph-osd@.service
-rm -f %{buildroot}%{_unitdir}/ceph-osd.target
-
-# Remove rbd-mirror
-rm -f %{buildroot}%{_bindir}/rbd-mirror
-rm -f %{buildroot}%{_mandir}/man8/rbd-mirror.8*
-rm -f %{buildroot}%{_unitdir}/ceph-rbd-mirror@.service
-rm -f %{buildroot}%{_unitdir}/ceph-rbd-mirror.target
-
-# Remove rbd-nbd
-rm -f %{buildroot}%{_bindir}/rbd-nbd
-rm -f %{buildroot}%{_mandir}/man8/rbd-nbd.8*
-
-# Remove cephfs-top
-rm -rf %{buildroot}%{python3_sitelib}/cephfs_top-*.egg-info
-rm -f %{buildroot}%{_bindir}/cephfs-top
-rm -f %{buildroot}%{_mandir}/man8/cephfs-top.8*
-
-# Remove additional files
-rm -f %{buildroot}%{_bindir}/ceph-diff-sorted
-rm -f %{buildroot}%{_mandir}/man8/ceph-diff-sorted.8*
-
-# Remove immutable-object-cache
-rm -f %{buildroot}%{_bindir}/ceph-immutable-object-cache
-rm -f %{buildroot}%{_mandir}/man8/ceph-immutable-object-cache.8*
-rm -f %{buildroot}%{_unitdir}/ceph-immutable-object-cache@.service
-rm -f %{buildroot}%{_unitdir}/ceph-immutable-object-cache.target
-
-# Remove cephfs-mirror
-rm -f %{buildroot}%{_bindir}/cephfs-mirror
-rm -f %{buildroot}%{_mandir}/man8/cephfs-mirror.8*
-rm -f %{buildroot}%{_unitdir}/cephfs-mirror@.service
-rm -f %{buildroot}%{_unitdir}/cephfs-mirror.target
-
-# Remove ceph-exporter
-rm -rf %{buildroot}%{_unitdir}/ceph-exporter.service
-
-# Remove cephadm
-rm -f %{buildroot}%{_sbindir}/cephadm
-rm -f %{buildroot}%{_mandir}/man8/cephadm.8*
-
+%if "%{_sbindir}" == "%{_bindir}"
+mv %{buildroot}%{_exec_prefix}/sbin/ceph-create-keys %{buildroot}%{_bindir}/
 %endif
 
 %if 0%{?suse_version}
@@ -1869,8 +1675,6 @@ rm -f %{buildroot}%{_mandir}/man8/cephadm.8*
 #################################################################################
 %files
 
-%if 0%{with server}
-
 %files base
 %{_bindir}/ceph-crash
 %{_bindir}/crushtool
@@ -1879,8 +1683,7 @@ rm -f %{buildroot}%{_mandir}/man8/cephadm.8*
 %{_bindir}/ceph-kvstore-tool
 %{_bindir}/ceph-run
 %{_presetdir}/50-ceph.preset
-%{_sbindir}/cephadm
-%{_exec_prefix}/sbin/ceph-create-keys
+%{_bindir}/ceph-create-keys
 %dir %{_libexecdir}/ceph
 %{_libexecdir}/ceph/ceph_common.sh
 %dir %{_libdir}/rados-classes
@@ -1941,7 +1744,19 @@ if [ $1 -eq 1 ] ; then
 /usr/bin/systemctl start ceph.target ceph-crash.service >/dev/null 2>&1 || :
 fi
 
-%preun base
+%postun base
+%{?ldconfig}
+%systemd_postun ceph.target
+
+%files -n cephadm
+%{_bindir}/cephadm
+%{_mandir}/man8/cephadm.8*
+%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm
+%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh
+%config(noreplace) %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
+%{_sysusersdir}/cephadm.conf
+
+%preun common
 %if 0%{?suse_version}
 %service_del_preun ceph.target ceph-crash.service
 %endif
@@ -1949,37 +1764,6 @@ fi
 %systemd_preun ceph.target ceph-crash.service
 %endif
 
-%postun base
-%{?ldconfig}
-%systemd_postun ceph.target
-
-%else
-%exclude %{_sbindir}/ceph-node-proxy
-%exclude %{python3_sitelib}/ceph_node_proxy/*
-%exclude %{python3_sitelib}/ceph_node_proxy-*
-%endif
-
-%if 0%{with server}
-
-%pre -n cephadm
-getent group cephadm >/dev/null || groupadd -r cephadm
-getent passwd cephadm >/dev/null || useradd -r -g cephadm -s /bin/bash -c "cephadm user for mgr/cephadm" -d %{_sharedstatedir}/cephadm cephadm
-exit 0
-
-%if ! 0%{?suse_version}
-%postun -n cephadm
-[ $1 -ne 0 ] || userdel cephadm || :
-%endif
-
-%files -n cephadm
-%{_sbindir}/cephadm
-%{_mandir}/man8/cephadm.8*
-%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm
-%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh
-%config(noreplace) %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
-
-%endif
-
 %files common
 %dir %{_docdir}/ceph
 %doc %{_docdir}/ceph/sample.ceph.conf
@@ -1995,20 +1779,16 @@ exit 0
 %{_bindir}/cephfs-table-tool
 %{_bindir}/crushdiff
 %{_bindir}/rados
-%if 0%{with radosgw}
 %{_bindir}/radosgw-admin
-%endif
 %{_bindir}/rbd
 %{_bindir}/rbd-replay
 %{_bindir}/rbd-replay-many
 %{_bindir}/rbdmap
-%if 0%{with radosgw}
 %{_bindir}/rgw-gap-list
 %{_bindir}/rgw-gap-list-comparator
 %{_bindir}/rgw-orphan-list
 %{_bindir}/rgw-restore-bucket-index
-%endif
-%{_sbindir}/mount.ceph
+%{_bindir}/mount.ceph
 %if 0%{?suse_version} && 0%{?suse_version} < 1550
 /sbin/mount.ceph
 %endif
@@ -2022,6 +1802,7 @@ exit 0
 %{_mandir}/man8/ceph-authtool.8*
 %{_mandir}/man8/ceph-conf.8*
 %{_mandir}/man8/ceph-dencoder.8*
+%{_mandir}/man8/ceph-diff-sorted.8*
 %{_mandir}/man8/ceph-rbdnamer.8*
 %{_mandir}/man8/ceph-syn.8*
 %{_mandir}/man8/ceph-post-file.8*
@@ -2029,19 +1810,15 @@ exit 0
 %{_mandir}/man8/crushdiff.8*
 %{_mandir}/man8/mount.ceph.8*
 %{_mandir}/man8/rados.8*
-%if 0%{with radosgw}
 %{_mandir}/man8/radosgw-admin.8*
-%endif
 %{_mandir}/man8/rbd.8*
 %{_mandir}/man8/rbdmap.8*
 %{_mandir}/man8/rbd-replay.8*
 %{_mandir}/man8/rbd-replay-many.8*
 %{_mandir}/man8/rbd-replay-prep.8*
-%if 0%{with radosgw}
 %{_mandir}/man8/rgw-orphan-list.8*
 %{_mandir}/man8/rgw-gap-list.8*
 %{_mandir}/man8/rgw-restore-bucket-index.8*
-%endif
 %dir %{_datadir}/ceph/
 %{_datadir}/ceph/known_hosts_drop.ceph.com
 %{_datadir}/ceph/id_rsa_drop.ceph.com
@@ -2050,9 +1827,7 @@ exit 0
 %config %{_sysconfdir}/bash_completion.d/ceph
 %config %{_sysconfdir}/bash_completion.d/rados
 %config %{_sysconfdir}/bash_completion.d/rbd
-%if 0%{with radosgw}
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
-%endif
 %config(noreplace) %{_sysconfdir}/ceph/rbdmap
 %{_unitdir}/rbdmap.service
 %dir %{_udevrulesdir}
@@ -2064,7 +1839,7 @@ exit 0
 %pre common
 CEPH_GROUP_ID=167
 CEPH_USER_ID=167
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 /usr/sbin/groupadd ceph -g $CEPH_GROUP_ID -o -r 2>/dev/null || :
 /usr/sbin/useradd ceph -u $CEPH_USER_ID -o -r -g ceph -s /sbin/nologin -c "Ceph daemons" -d %{_localstatedir}/lib/ceph 2>/dev/null || :
 %endif
@@ -2097,8 +1872,6 @@ if [ "$1" -eq "0" ] ; then
     rm -rf %{_sysconfdir}/ceph
 fi
 
-%if 0%{with server}
-
 %files mds
 %{_bindir}/ceph-mds
 %{_mandir}/man8/ceph-mds.8*
@@ -2473,7 +2246,6 @@ fi
 %dir %{_libexecdir}/rbd-nbd
 %{_libexecdir}/rbd-nbd/rbd-nbd_quiesce
 
-%if %{with radosgw}
 %files radosgw
 %{_bindir}/ceph-diff-sorted
 %{_bindir}/radosgw
@@ -2481,7 +2253,6 @@ fi
 %{_bindir}/radosgw-es
 %{_bindir}/radosgw-object-expirer
 %{_bindir}/rgw-policy-check
-%{_mandir}/man8/ceph-diff-sorted.8*
 %{_mandir}/man8/radosgw.8*
 %{_mandir}/man8/rgw-policy-check.8*
 %dir %{_localstatedir}/lib/ceph/radosgw
@@ -2522,7 +2293,6 @@ if [ $1 -ge 1 ] ; then
     /usr/bin/systemctl try-restart ceph-radosgw@.service > /dev/null 2>&1 || :
   fi
 fi
-%endif
 
 %files osd
 %{_bindir}/ceph-clsinfo
@@ -2632,9 +2402,8 @@ fi
 
 %endif
 
-%endif
-
 %files -n librados2
+%doc %{_docdir}/ceph/COPYING
 %{_libdir}/librados.so.*
 %dir %{_libdir}/ceph
 %{_libdir}/ceph/libceph-common.so.*
@@ -2693,6 +2462,7 @@ fi
 %endif
 
 %files -n librbd1
+%doc %{_docdir}/ceph/COPYING
 %{_libdir}/librbd.so.*
 %if %{with lttng}
 %{_libdir}/librbd_tp.so.*
@@ -2712,8 +2482,6 @@ fi
 %{_libdir}/librbd_tp.so
 %endif
 
-%if 0%{with radosgw}
-
 %files -n librgw2
 %{_libdir}/librgw.so.*
 %if %{with lttng}
@@ -2737,8 +2505,6 @@ fi
 %{python3_sitearch}/rgw.cpython*.so
 %{python3_sitearch}/rgw-*.egg-info
 
-%endif
-
 %files -n python%{python3_pkgversion}-rbd
 %{python3_sitearch}/rbd.cpython*.so
 %{python3_sitearch}/rbd-*.egg-info
@@ -2791,12 +2557,10 @@ fi
 %{_mandir}/man8/cephfs-shell.8*
 %endif
 
-%if 0%{with server}
 %files -n cephfs-top
 %{python3_sitelib}/cephfs_top-*.egg-info
 %{_bindir}/cephfs-top
 %{_mandir}/man8/cephfs-top.8*
-%endif
 
 %if 0%{with ceph_test_package}
 %files -n ceph-test
@@ -2953,8 +2717,6 @@ fi
 exit 0
 %endif
 
-%if 0%{with server}
-
 %files grafana-dashboards
 %if 0%{?suse_version}
 %attr(0755,root,root) %dir %{_sysconfdir}/grafana
@@ -2979,62 +2741,148 @@ exit 0
 %dir %{python3_sitelib}/ceph_node_proxy
 %{python3_sitelib}/ceph_node_proxy/*
 %{python3_sitelib}/ceph_node_proxy-*
-%endif
 
 %changelog
-* Tue Feb 17 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-5
-- ceph-20.2.0, rebuild w/ libarrow-23.0.1, system zstd
+* Wed Feb 18 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-9
+- ceph-20.2.0, rebuild with libarrow-23.0.1, cmake-4, system zstd
 
-* Tue Feb 3 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-4
-- ceph-20.2.0, rebuild w/ libarrow-23.0.0
+* Wed Jan 28 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-8
+- ceph-20.2.0, rebuild with libarrow-23.0.0, side tag f44-build-side-127546
+
+* Wed Jan 28 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-7
+- ceph-20.2.0, rhbz#2433903
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2:20.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2:20.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Dec 10 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-4
+- ceph-20.2.0, disable crimson, core team says it's not ready
 
 * Fri Dec 5 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-3
+- ceph-20.2.0, rhbz#2419150
+
+* Thu Dec 4 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-2
 - ceph-20.2.0, enable crimson
 
-* Fri Nov 21 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-2
-- ceph-20.2.0, rebuild with libarrow-22.0.0 and liborc-2.2.1
-
-* Wed Nov 19 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-1
+* Tue Nov 18 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.2.0-1
 - ceph-20.2.0 GA
 
-* Tue Oct 21 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.1-3
-- ceph-20.1.1 RC, rhbz#2403112
+* Tue Nov  4 2025 Tom Callaway <spot@fedoraproject.org> - 2:20.1.1-4
+- rebuild for new fuse3
 
-* Fri Oct 10 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.1-2
-- ceph-20.1.1 RC
+* Fri Oct 24 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.1-2
+- ceph-20.1.1 RC, rebuild with libarrow-22.0.0, side tag f44-build-side-121464
+
+* Thu Oct 16 2025 Gordon Messmer <gordon.messmer[at]gmail.com> - 2:20.1.1-3
+- Use rpm's native resource tunable to limit parallelism. BZ#2404624
 
 * Tue Oct 7 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.1-1
 - ceph-20.1.1 RC
 
-* Thu Sep 11 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 2:20.1.0-3
-- Avoid grpc and xsimd dependencies
+* Tue Sep 23 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.0-6
+- ceph-20.1.0 RC, rhbz#2396036 (gmock, gtest again)
 
-* Thu Sep 11 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.0-2
-- ceph-20.1.0 RC, restore sysusers
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 2:20.1.0-5
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Tue Sep 16 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.0-4
+- ceph-20.1.0 RC, rhbz#2395703 (gmock, gtest again)
+
+* Fri Sep 12 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.0-3
+- ceph-20.1.0 RC, rhbz#2394758 (gmock, gtest)
+
+* Tue Sep 9 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.0-2
+- ceph-20.1.0 RC, rhbz#2394363
 
 * Mon Sep 8 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.1.0-1
 - ceph-20.1.0 RC
 
-* Tue Jul 8 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:20.0.0
-- ceph-20.0.0
+* Mon Apr 28 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.2-5
+- ceph-19.2.2, build in side tag f43-build-side-110906
 
-* Fri Apr 11 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.2-1
+* Wed Apr 16 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2:19.2.2-4
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Mon Apr 14 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.2-3
+- ceph-19.2.2, rhbz#2359214 again
+
+* Sat Apr 12 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.2-2
+- ceph-19.2.2, rhbz#2359214
+
+* Thu Apr 10 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.2-1
 - ceph-19.2.2 GA
 
-* Sat Mar 8 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
-- cephadm dependencies (keep in sync w/ rawhide, f42, etc.)
+* Thu Mar 13 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-7
+- rebuild with libarrow-19.0.1 (and liborc-2.1.1)
 
-* Sat Mar 1 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-3
-- rebuild with cmake-4
+* Fri Mar 7 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-6
+- cephadm dependencies
 
-* Tue Feb 18 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-2
-- ceph-19.2.1, rebuild with liborc-2.1.0, libarrow-19.0.0
+* Sat Mar 1 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-5
+- rebuild w/ cmake-4
 
-* Fri Feb 7 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-1
+* Mon Feb 17 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-4
+- ceph-19.2.1, rebuild w/ libarrow 19, liborc 2.1, f43-build-side-105129
+
+* Sat Feb  8 2025 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 2:19.2.1-3
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Fri Feb 7 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-2
+- ceph-19.2.1, rebuild w/ libarrow 19, liborc 2.1, f43-build-side-105129
+
+* Thu Feb 6 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.1-1
 - ceph-19.2.1 GA
 
-* Thu Nov 14 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.0-2
-- ceph-19.2.0, python-scikit-learn -> python-scikit_learn, license
+* Fri Jan 24 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.0-10
+- hack around cmake -std=gnu99 w/ userspace-rcu
+- use system version of gmock and gtest to avoid bundled brain damage
+  that creates but does not install gmock and gtest shlibs rhbz#2341687
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:19.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Dec 20 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.0-8
+- remove openssl-engine
+
+* Sun Dec 08 2024 Pete Walter <pwalter@fedoraproject.org> - 2:19.2.0-7
+- Rebuild for ICU 76
+
+* Tue Nov 26 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.0-6
+- build in f42-build-side-100844 again
+
+* Fri Nov 22 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.0-5
+- build in f42-build-side-100844
+
+* Mon Nov 18 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.0-4
+- and back; ceph-19.2.0 scikit_learn -> scikit-learn  rhbz#2327036
+
+* Wed Nov 13 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.0-3
+- ceph-19.2.0 scikit-learn -> scikit_learn  rhbz#2325990
+
+* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 2:19.2.0-2
+- Rebuild for yaml-cpp 0.8
 
 * Fri Sep 20 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.0-1
 - ceph-19.2.0 GA
+
+* Fri Aug 23 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.1.1-0.1
+- ceph-19.1.1 RC
+
+* Fri Jul 26 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.1.0-0.5
+- possible fix for ppc64le build, see rhbz 2297744
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:19.1.0-0.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jul 12 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.1.0-0.3
+- install libtacopie.so
+
+* Thu Jul 11 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.1.0-0.2
+- install libcpp_redis.so
+
+* Tue Jul 9 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.1.0-0.1
+- ceph-19.1.0 RC
+

cmake-modules-BuildBoost.cmake.noautopatch

@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index 2e92132366..3cb1e3d958 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -62,7 +62,7 @@ function(do_build_boost version)
-   else()
-     list(APPEND boost_features "address-model=32")
-   endif()
--  set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
-+  set(BOOST_CXXFLAGS "-fPIC -w -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -ftemplate-depth-1024 -fno-new-ttp-matching -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") # check on arm, etc <---XXX
-   list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
- 
-   set(boost_with_libs)