ceph-17.2.5, more ELN (rhel 10)

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2023-01-27 07:44:15 -05:00
parent c63ac8cd1c
commit 68c121780b
1 changed files with 8 additions and 11 deletions

View File

@ -93,7 +93,7 @@
%endif %endif
%bcond_with seastar %bcond_with seastar
%bcond_with jaeger %bcond_with jaeger
%if 0%{?fedora} || 0%{?suse_version} >= 1500 %if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 10
# distros that ship cmd2 and/or colorama # distros that ship cmd2 and/or colorama
%bcond_without cephfs_shell %bcond_without cephfs_shell
%else %else
@ -162,7 +162,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 17.2.5 Version: 17.2.5
Release: 8%{?dist} Release: 9%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
%endif %endif
@ -355,7 +355,7 @@ BuildRequires: libpciaccess-devel
BuildRequires: lksctp-tools-devel BuildRequires: lksctp-tools-devel
BuildRequires: ragel BuildRequires: ragel
BuildRequires: systemtap-sdt-devel BuildRequires: systemtap-sdt-devel
%if 0%{?fedora} %if 0%{?fedora} || 0%{?rhel} >= 10
BuildRequires: libubsan BuildRequires: libubsan
BuildRequires: libasan BuildRequires: libasan
%endif %endif
@ -669,7 +669,7 @@ Group: System/Filesystems
%endif %endif
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-numpy Requires: python%{python3_pkgversion}-numpy
%if 0%{?fedora} || 0%{?suse_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 10
Requires: python%{python3_pkgversion}-scikit-learn Requires: python%{python3_pkgversion}-scikit-learn
%endif %endif
Requires: python3-scipy Requires: python3-scipy
@ -1334,12 +1334,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS="$RPM_LD_FLAGS" export LDFLAGS="$RPM_LD_FLAGS"
# Workaround to https://tracker.ceph.com/issues/56610
%if 0%{?fedora} >= 37
export CFLAGS="$RPM_OPT_FLAGS -DFMT_DEPRECATED_OSTREAM"
export CXXFLAGS="$RPM_OPT_FLAGS -DFMT_DEPRECATED_OSTREAM"
%endif
# Workaround to https://tracker.ceph.com/issues/56610 # Workaround to https://tracker.ceph.com/issues/56610
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 %if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
export CFLAGS="$RPM_OPT_FLAGS -DFMT_DEPRECATED_OSTREAM" export CFLAGS="$RPM_OPT_FLAGS -DFMT_DEPRECATED_OSTREAM"
@ -2623,8 +2617,11 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Fri Jan 27 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.5-9
- ceph-17.2.5, more ELN (rhel 10)
* Thu Jan 26 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.5-8 * Thu Jan 26 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.5-8
- ceph-17.2.5, rocksdb on ELN - ceph-17.2.5, rocksdb on ELN (rhel 10)
* Tue Jan 24 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.5-7 * Tue Jan 24 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.5-7
- ceph-17.2.5, rebuild with gtest-13 rhbz#2163823 - ceph-17.2.5, rebuild with gtest-13 rhbz#2163823