From 1a3a1b095865d2e2258be81fcceb3d798b3e4d5e Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 27 Sep 2021 12:05:45 +0200 Subject: [PATCH] rpm: enable system_pmdk bcond for SUSE builds ecb8d2cae2c063acf4e7e1bffed887d52117762f disabled the system_pmdk bcond for all build targets based on the fact that pmdk 1.10 was not available on any of them. Now that openSUSE Tumbleweed ships pmdk 1.11, we re-enable the system_pmdk bcond to fix the master build for openSUSE Tumbleweed. Since openSUSE Tumbleweed is the *only* SUSE build target master supports, there is no need for greater granularity in the distro conditional here. Signed-off-by: Nathan Cutler --- ceph.spec.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 1f5dcfd8f177..3579d7e628ea 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -29,7 +29,6 @@ %else %bcond_without tcmalloc %endif -%bcond_with system_pmdk %bcond_without rbd_ssd_cache %ifarch x86_64 %bcond_without rbd_rwl_cache @@ -37,6 +36,7 @@ %bcond_with rbd_rwl_cache %endif %if 0%{?fedora} || 0%{?rhel} +%bcond_with system_pmdk %bcond_without selinux %if 0%{?rhel} >= 8 %bcond_with cephfs_java @@ -53,6 +53,7 @@ %global _remote_tarball_prefix https://download.ceph.com/tarballs/ %endif %if 0%{?suse_version} +%bcond_without system_pmdk %bcond_with amqp_endpoint %bcond_with cephfs_java %bcond_with kafka_endpoint -- 2.47.3