1 files changed, 18 insertions, 17 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index b05a8853da1..4b4c82c436b 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -171,13 +171,9 @@ BuildRequires: openssl-devel
 BuildRequires: vespa-lz4-devel >= 1.9.2-2
 BuildRequires: vespa-onnxruntime-devel = 1.12.1
 BuildRequires: vespa-libzstd-devel >= 1.4.5-2
-%if 0%{?fc34}
-BuildRequires: protobuf-devel
 %if 0%{?amzn2022}
+BuildRequires: protobuf-devel
 BuildRequires: llvm-devel >= 13.0.0
-%else
-BuildRequires: llvm-devel >= 12.0.0
-%endif
 BuildRequires: boost-devel >= 1.75
 BuildRequires: gtest-devel
 BuildRequires: gmock-devel
@@ -198,8 +194,15 @@ BuildRequires: gmock-devel
 %endif
 %if 0%{?fc37}
 BuildRequires: protobuf-devel
-BuildRequires: llvm-devel >= 14.0.0
-BuildRequires: boost-devel >= 1.76
+BuildRequires: llvm-devel >= 14.0.5
+BuildRequires: boost-devel >= 1.78
+BuildRequires: gtest-devel
+BuildRequires: gmock-devel
+%endif
+%if 0%{?fc38}
+BuildRequires: protobuf-devel
+BuildRequires: llvm-devel >= 14.0.5
+BuildRequires: boost-devel >= 1.78
 BuildRequires: gtest-devel
 BuildRequires: gmock-devel
 %endif
@@ -328,12 +331,8 @@ Requires: gtest
 %endif
 %if 0%{?fedora}
 Requires: gtest
-%if 0%{?fc34}
 %if 0%{?amzn2022}
 %define _vespa_llvm_version 13
-%else
-%define _vespa_llvm_version 12
-%endif
 %endif
 %if 0%{?fc35}
 %define _vespa_llvm_version 13
@@ -344,6 +343,9 @@ Requires: gtest
 %if 0%{?fc37}
 %define _vespa_llvm_version 14
 %endif
+%if 0%{?fc38}
+%define _vespa_llvm_version 14
+%endif
 %define _extra_link_directory %{_vespa_deps_prefix}/lib64
 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas
 %endif
@@ -459,12 +461,8 @@ Requires: protobuf
 %endif
 %if 0%{?fedora}
 Requires: protobuf
-%if 0%{?fc34}
 %if 0%{?amzn2022}
 Requires: llvm-libs >= 13.0.0
-%else
-Requires: llvm-libs >= 12.0.0
-%endif
 %endif
 %if 0%{?fc35}
 Requires: llvm-libs >= 13.0.0
@@ -473,7 +471,10 @@ Requires: llvm-libs >= 13.0.0
 Requires: llvm-libs >= 14.0.0
 %endif
 %if 0%{?fc37}
-Requires: llvm-libs >= 14.0.0
+Requires: llvm-libs >= 14.0.5
+%endif
+%if 0%{?fc38}
+Requires: llvm-libs >= 14.0.5
 %endif
 %endif
 Requires: vespa-onnxruntime = 1.12.1
@@ -571,7 +572,7 @@ nearest neighbor search used for low-level benchmarking.
 %endif
 %else
 %setup -q
-%if ( 0%{?el8} || 0%{?fc34} ) && %{_vespa_llvm_version} < 13
+%if 0%{?el8} && %{_vespa_llvm_version} < 13
 if grep -qs 'result_pair<R>(' /usr/include/llvm/ADT/STLExtras.h
 then
   patch /usr/include/llvm/ADT/STLExtras.h < dist/STLExtras.h.diff