From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 15 Dec 2022 15:54:43 +0000 (-0500)
Subject: rpm: combine system_utf8proc option into system_arrow
X-Git-Tag: v18.1.0~452^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7760d31a72c52c084b3978785840c428dc62f9d4;p=ceph.git

rpm: combine system_utf8proc option into system_arrow

libarrow-devel depends on utf8proc-devel, so we can't enable
system_arrow without system_utf8proc

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 4e8c45ab706f..f5a6c0418d4b 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -106,7 +106,6 @@
 %bcond_with cephfs_shell
 %endif
 %bcond_with system_arrow
-%bcond_with system_utf8proc
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8
 %global weak_deps 1
 %endif
@@ -324,8 +323,6 @@ BuildRequires:  libpmemobj-devel >= 1.8
 %if 0%{with system_arrow}
 BuildRequires:  libarrow-devel
 BuildRequires:  parquet-libs-devel
-%endif
-%if 0%{with system_utf8proc}
 BuildRequires:  utf8proc-devel
 %endif
 %if 0%{with seastar}
@@ -1420,8 +1417,6 @@ cmake .. \
 %endif
 %if 0%{with system_arrow}
     -DWITH_SYSTEM_ARROW:BOOL=ON \
-%endif
-%if 0%{with system_utf8proc}
     -DWITH_SYSTEM_UTF8PROC:BOOL=ON \
 %endif
 %if 0%{with seastar}