diff --git a/SOURCES/0021-src-rgw-CMakeLists.txt.patch b/SOURCES/0021-src-rgw-CMakeLists.txt.patch new file mode 100644 index 0000000..48e7ed3 --- /dev/null +++ b/SOURCES/0021-src-rgw-CMakeLists.txt.patch @@ -0,0 +1,11 @@ +--- ceph-17.2.0/src/rgw/CMakeLists.txt.orig 2022-04-28 13:44:40.547580835 -0400 ++++ ceph-17.2.0/src/rgw/CMakeLists.txt 2022-04-28 13:45:05.040153926 -0400 +@@ -4,7 +4,7 @@ + endif() + + if(WITH_RADOSGW_SELECT_PARQUET) +- set(ARROW_LIBRARIES Arrow::Parquet) ++ set(ARROW_LIBRARIES Arrow::Arrow Arrow::Parquet) + add_definitions(-D_ARROW_EXIST) + message("-- arrow is installed, radosgw/s3select-op is able to process parquet objects") + endif(WITH_RADOSGW_SELECT_PARQUET) diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 5d55f85..be6c4c5 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -101,7 +101,7 @@ # distros that do _not_ ship cmd2/colorama %bcond_with cephfs_shell %endif -%bcond_with system_arrow +%bcond_without system_arrow %bcond_without system_utf8proc %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 %global weak_deps 1 @@ -153,7 +153,7 @@ ################################################################################# Name: ceph Version: 17.2.0 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -181,6 +181,7 @@ Patch0017: 0017-gcc-12-omnibus.patch Patch0018: 0018-src-rgw-store-dbstore-CMakeLists.txt.patch Patch0019: 0019-cmake-modules-CheckCxxAtomic.cmake.patch Patch0020: 0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch +Patch0021: 0021-src-rgw-CMakeLists.txt.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -2583,6 +2584,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Wed Apr 27 2022 Kaleb S. KEITHLEY - 2:17.2.0-2 +- 17.2.0 w/ system libarrow + * Wed Apr 20 2022 Kaleb S. KEITHLEY - 2:17.2.0-1 - 17.2.0 GA