aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@verizonmedia.com>2022-12-07 18:17:36 +0100
committerGitHub <noreply@github.com>2022-12-07 18:17:36 +0100
commitfdfd6fc892245ea164729caf462aed4cac1cb6ef (patch)
tree75fba95cdeee0f5dc6b79b3bf45db0694d146784 /dist
parent99198a68e6359b5fe167f6cbbc6bca277909be8f (diff)
parent69bd5cb136d82eea742b80afac10d1d1e3dbdf9f (diff)
Merge pull request #25148 from vespa-engine/aressem/use-python39-pybind11
Have to switch to python39-pybind11-devel. pybind11-devel has been re…
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index a568c47f7f6..117f3cc3e84 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -52,19 +52,21 @@ BuildRequires: gcc-toolset-11-gcc-c++
BuildRequires: gcc-toolset-11-binutils
BuildRequires: gcc-toolset-11-libasan-devel
BuildRequires: gcc-toolset-11-libatomic-devel
+BuildRequires: python39-pybind11-devel
+BuildRequires: python39-devel
%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable
%else
BuildRequires: gcc-toolset-11-gcc-c++
BuildRequires: gcc-toolset-11-binutils
BuildRequires: gcc-toolset-11-libasan-devel
BuildRequires: gcc-toolset-11-libatomic-devel
+BuildRequires: pybind11-devel
+BuildRequires: python36-devel
%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable
%endif
BuildRequires: maven
BuildRequires: maven-openjdk17
-BuildRequires: pybind11-devel
BuildRequires: python3-pytest
-BuildRequires: python36-devel
BuildRequires: glibc-langpack-en
%endif
%if 0%{?el9}
@@ -401,8 +403,12 @@ Summary: Vespa - The open big data serving engine - ann-benchmark
Requires: %{name}-base-libs = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
%if 0%{?el8}
+%if 0%{?_centos_stream}
+Requires: python39
+%else
Requires: python36
%endif
+%endif
%if 0%{?el9}
Requires: python3
%endif