From 5e7077ab2cfd2fa186c0904594b9a91c5b91e78e Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sat, 8 Mar 2025 09:15:06 -0500 Subject: [PATCH] cephadm dependencies (keeping .spec in sync w/ rawhide, f42, etc.) --- 0036-src-cephadm-build.py.patch | 11 ----------- ceph.spec | 11 +++++++---- 2 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 0036-src-cephadm-build.py.patch diff --git a/0036-src-cephadm-build.py.patch b/0036-src-cephadm-build.py.patch deleted file mode 100644 index 61ff392..0000000 --- a/0036-src-cephadm-build.py.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ceph-19.0.0-28-g77e2e020/src/cephadm/build.py.orig 2023-12-14 13:03:12.873138944 -0500 -+++ ceph-19.0.0-28-g77e2e020/src/cephadm/build.py 2023-12-14 13:03:31.909811381 -0500 -@@ -73,7 +73,7 @@ - def __init__(self, cli_args): - self.cli_args = cli_args - self._maj_min = sys.version_info[0:2] -- self.install_dependencies = True -+ self.install_dependencies = False - self.deps_mode = DependencyMode[cli_args.bundled_dependencies] - if self.deps_mode == DependencyMode.none: - self.install_dependencies = False diff --git a/ceph.spec b/ceph.spec index 36dc7df..2168a25 100644 --- a/ceph.spec +++ b/ceph.spec @@ -168,7 +168,7 @@ %{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0} %endif %endif -%bcond_without cephadm_bundling +%bcond_with cephadm_bundling %bcond_without cephadm_pip_deps %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} @@ -249,7 +249,6 @@ Patch0032: 0032-cmake-modules-BuildBoost.cmake.patch Patch0033: 0033-boost-asm.patch Patch0034: 0034-src-pybind-rbd-rbd.pyx.patch Patch0035: 0035-src-CMakeLists.txt.patch -Patch0036: 0036-src-cephadm-build.py.patch Patch0040: 0040-gcc-14.patch Patch0041: 0041-src-mgr-PyModule.cc.patch Patch0043: 0043_src_common_crc32c_ppc_asm.S.patch @@ -628,10 +627,11 @@ Recommends: podman >= 2.0.2 %endif %if 0%{with cephadm_bundling} %if 0%{without cephadm_pip_deps} -BuildRequires: python3-jinja2 >= 2.10 +BuildRequires: python%{python3_pkgversion}-jinja2 >= 2.10 %endif %else -Requires: python3-jinja2 >= 2.10 +Requires: python%{python3_pkgversion}-jinja2 >= 2.10 +Requires: python%{python3_pkgversion}-pyyaml %endif %description -n cephadm Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed @@ -2939,6 +2939,9 @@ exit 0 %endif %changelog +* Sat Mar 8 2025 Kaleb S. KEITHLEY +- cephadm dependencies (keep in sync w/ rawhide, f42, etc.) + * Sat Mar 1 2025 Kaleb S. KEITHLEY - 2:19.2.1-3 - rebuild with cmake-4