diff options
| author | Tor Egge <Tor.Egge@online.no> | 2023-02-22 12:08:55 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2023-02-22 12:08:55 +0100 |
| commit | cfdb8a86aa8c04933bb865a865cad487a89a57d1 (patch) | |
| tree | bb093ab4d53eea16207b8072fc011d8bbad2660b /dist | |
| parent | 6c4c2f2a432896ee5ae2f6f8320342627840dab8 (diff) | |
Don't exclude protobuf or icu from requires when using OS supplied
packages.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 56b849a8135..6bed9904124 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -95,6 +95,7 @@ BuildRequires: vespa-gtest = 1.11.0 BuildRequires: vespa-lz4-devel >= 1.9.4-1 BuildRequires: vespa-onnxruntime-devel = 1.13.1 BuildRequires: vespa-protobuf-devel = 3.21.7 +%define _use_vespa_protobuf 1 BuildRequires: vespa-libzstd-devel >= 1.5.2-1 %endif %if 0%{?el9} @@ -106,6 +107,7 @@ BuildRequires: vespa-lz4-devel >= 1.9.4-1 BuildRequires: vespa-onnxruntime-devel = 1.13.1 BuildRequires: vespa-libzstd-devel >= 1.5.2-1 BuildRequires: vespa-protobuf-devel = 3.21.7 +%define _use_vespa_protobuf 1 BuildRequires: llvm-devel BuildRequires: boost-devel >= 1.75 BuildRequires: gtest-devel @@ -210,7 +212,7 @@ Requires: %{name}-tools = %{version}-%{release} # Ugly workaround because vespamalloc/src/vespamalloc/malloc/mmap.cpp uses the private # _dl_sym function. # Exclude automated requires for libraries in /opt/vespa-deps/lib64. -%global __requires_exclude ^lib(c\\.so\\.6\\(GLIBC_PRIVATE\\)|pthread\\.so\\.0\\(GLIBC_PRIVATE\\)|(icui18n|icuuc|lz4|protobuf|zstd|onnxruntime%{?_use_vespa_openssl:|crypto|ssl}%{?_use_vespa_openblas:|openblas}%{?_use_vespa_re2:|re2}%{?_use_vespa_xxhash:|xxhash}%{?_use_vespa_gtest:|(gtest|gmock)(_main)?})\\.so\\.[0-9.]*\\([A-Za-z._0-9]*\\))\\(64bit\\)$ +%global __requires_exclude ^lib(c\\.so\\.6\\(GLIBC_PRIVATE\\)|pthread\\.so\\.0\\(GLIBC_PRIVATE\\)|(lz4%{?_use_vespa_protobuf:|protobuf}|zstd|onnxruntime%{?_use_vespa_openssl:|crypto|ssl}%{?_use_vespa_openblas:|openblas}%{?_use_vespa_re2:|re2}%{?_use_vespa_xxhash:|xxhash}%{?_use_vespa_gtest:|(gtest|gmock)(_main)?})\\.so\\.[0-9.]*\\([A-Za-z._0-9]*\\))\\(64bit\\)$ %description |