From: Casey Bodley Date: Tue, 19 Aug 2025 13:29:01 +0000 (-0400) Subject: rpm: remove special cases for gts_version < 13 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13f1279a66e533eaa17295e891d52659d6b913f0;p=ceph.git rpm: remove special cases for gts_version < 13 now that we no longer set gts_version to 11, remove any special cases for gts_version < 13 Signed-off-by: Casey Bodley (cherry picked from commit 77c6ef8e3b3a92505b0ae787f30fb77bf57c77ba) --- diff --git a/ceph.spec.in b/ceph.spec.in index a32c2e612f921..08a5b7dc7040f 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -195,10 +195,6 @@ %if 0%{?enable_devtoolset13:1} %enable_devtoolset13 %endif -%else -%if 0%{?enable_devtoolset11:1} -%enable_devtoolset11 -%endif %endif %endif @@ -267,11 +263,7 @@ BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ >= 13.3 %else BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ %endif -%if 0%{?gts_version} >= 12 BuildRequires: gcc-toolset-%{gts_version}-runtime -%else -BuildRequires: gcc-toolset-%{gts_version}-build -%endif BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel %endif %if 0%{?fedora} || 0%{?rhel} == 9 || 0%{?openEuler} @@ -399,12 +391,7 @@ BuildRequires: libasan BuildRequires: protobuf-devel BuildRequires: protobuf-compiler %if 0%{?gts_version} > 0 -%if 0%{?gts_version} >= 12 BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin -%else -BuildRequires: gcc-toolset-%{gts_version}-annobin -BuildRequires: gcc-toolset-%{gts_version}-annobin-plugin-gcc -%endif BuildRequires: gcc-toolset-%{gts_version}-libubsan-devel BuildRequires: gcc-toolset-%{gts_version}-libasan-devel %endif