From d5ccf482b2d7c6e8a8db88cf3b7b2b3710fb92f3 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sat, 1 Mar 2025 20:40:28 -0500 Subject: [PATCH] rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 rebuild with cmake-4 --- 0054-cmake-4.patch | 32 ++++++++++++++++++++++++++++++++ ceph.spec | 6 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0054-cmake-4.patch diff --git a/0054-cmake-4.patch b/0054-cmake-4.patch new file mode 100644 index 0000000..1b28bb8 --- /dev/null +++ b/0054-cmake-4.patch @@ -0,0 +1,32 @@ +--- ceph-19.2.1/src/cpp_redis/CMakeLists.txt.orig 2025-03-01 06:02:26.445691012 -0500 ++++ ceph-19.2.1/src/cpp_redis/CMakeLists.txt 2025-03-01 06:02:51.261243247 -0500 +@@ -23,7 +23,6 @@ + ### + # config + ### +-cmake_minimum_required(VERSION 2.8.7) + set(CMAKE_MACOSX_RPATH 1) + include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) + +--- ceph-19.2.1/src/cpp_redis/tacopie/CMakeLists.txt.orig 2025-03-01 06:40:40.147203851 -0500 ++++ ceph-19.2.1/src/cpp_redis/tacopie/CMakeLists.txt 2025-03-01 06:40:52.788980958 -0500 +@@ -23,7 +23,6 @@ + ### + # config + ### +-cmake_minimum_required(VERSION 2.8.7) + set(CMAKE_MACOSX_RPATH 1) + include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) + +--- ceph-19.2.1/src/jaegertracing/opentelemetry-cpp/CMakeLists.txt.orig 2025-03-01 11:04:04.630843703 -0500 ++++ ceph-19.2.1/src/jaegertracing/opentelemetry-cpp/CMakeLists.txt 2025-03-01 13:08:27.186470226 -0500 +@@ -1,8 +1,8 @@ +-cmake_minimum_required(VERSION 3.1) + + # See https://cmake.org/cmake/help/v3.3/policy/CMP0057.html required by certain + # versions of gtest + cmake_policy(SET CMP0057 NEW) ++cmake_minimum_required(VERSION 3.12) + + # See https://cmake.org/cmake/help/v3.12/policy/CMP0074.html required by certain + # version of zlib which is dependeded by cURL. diff --git a/ceph.spec b/ceph.spec index 673d745..36dc7df 100644 --- a/ceph.spec +++ b/ceph.spec @@ -218,7 +218,7 @@ ################################################################################# Name: ceph Version: 19.2.1 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -258,6 +258,7 @@ Patch0045: 0045_src-commom-crc32c_ppc_fast_zero_asm.S.patch Patch0046: 0046-src-s3select-include-s3select_parquet_intrf.h.patch Patch0047: 0047-openssl-no-engine.patch Patch0049: 0049-src-rocksdb-db-blob-blob_file_meta.h.patch +Patch0054: 0054-cmake-4.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -2938,6 +2939,9 @@ exit 0 %endif %changelog +* Sat Mar 1 2025 Kaleb S. KEITHLEY - 2:19.2.1-3 +- rebuild with cmake-4 + * Tue Feb 18 2025 Kaleb S. KEITHLEY - 2:19.2.1-2 - ceph-19.2.1, rebuild with liborc-2.1.0, libarrow-19.0.0