diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-09-27 07:08:36 +0000 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-09-27 07:08:36 +0000 |
commit | fe64026f259df982a7c5a5bdf093603dfb3e486d (patch) | |
tree | af2eb9124be1bcec9c359a8029ef1425eea3afdb /dist | |
parent | 4f0e63ee85a845b4b959bd70a9661b63cb590344 (diff) | |
parent | 9377da84086392e118d69b467006e73fe9ae3f70 (diff) |
Merge branch 'master' into bratseth/linguistics-components
Conflicts:
linguistics-components/src/main/resources/configdefinitions/sentence-piece.def
linguistics/src/main/resources/configdefinitions/language.sentencepiece.sentence-piece.def
linguistics/src/main/resources/configdefinitions/sentence-piece.def
Diffstat (limited to 'dist')
-rw-r--r-- | dist/vespa.spec | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 0c5267f2847..1fa9fbc9796 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -79,6 +79,7 @@ BuildRequires: cmake3 BuildRequires: llvm7.0-devel BuildRequires: vespa-boost-devel >= 1.76.0-1 BuildRequires: vespa-gtest >= 1.8.1-1 +%define _use_vespa_gtest 1 BuildRequires: vespa-icu-devel >= 65.1.0-1 BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel = 1.7.1 @@ -108,6 +109,7 @@ BuildRequires: vespa-boost-devel >= 1.76.0-1 BuildRequires: vespa-openssl-devel >= 1.1.1l-1 %define _use_vespa_openssl 1 BuildRequires: vespa-gtest >= 1.8.1-1 +%define _use_vespa_gtest 1 BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel = 1.7.1 BuildRequires: vespa-protobuf-devel = 3.17.3 @@ -233,6 +235,7 @@ Requires: llvm7.0 Requires: vespa-telegraf >= 1.1.1-1 Requires: vespa-valgrind >= 3.17.0-1 %endif +Requires: vespa-gtest >= 1.8.1-1 %define _vespa_llvm_version 7 %define _extra_link_directory /usr/lib64/llvm7.0/lib;%{_vespa_deps_prefix}/lib64 %define _extra_include_directory /usr/include/llvm7.0;%{_vespa_deps_prefix}/include @@ -247,10 +250,12 @@ Requires: vespa-valgrind >= 3.17.0-1 %else %define _vespa_llvm_version 10 %endif +Requires: vespa-gtest >= 1.8.1-1 %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include %endif %if 0%{?fedora} +Requires: gtest %if 0%{?fc32} %define _vespa_llvm_version 10 %endif @@ -285,7 +290,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})\\.so\\.[0-9.]*\\([A-Za-z._0-9]*\\))\\(64bit\\)$ +%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\\)$ %description @@ -791,7 +796,6 @@ fi %{_prefix}/lib/jars/bcprov-jdk15on-*.jar %{_prefix}/lib/jars/config-bundle-jar-with-dependencies.jar %{_prefix}/lib/jars/configdefinitions-jar-with-dependencies.jar -%{_prefix}/lib/jars/configgen.jar %{_prefix}/lib/jars/config-model-api-jar-with-dependencies.jar %{_prefix}/lib/jars/config-model-jar-with-dependencies.jar %{_prefix}/lib/jars/config-provisioning-jar-with-dependencies.jar @@ -799,7 +803,6 @@ fi %{_prefix}/lib/jars/container-disc-jar-with-dependencies.jar %{_prefix}/lib/jars/container-search-and-docproc-jar-with-dependencies.jar %{_prefix}/lib/jars/container-search-gui-jar-with-dependencies.jar -%{_prefix}/lib/jars/defaults-jar-with-dependencies.jar %{_prefix}/lib/jars/docprocs-jar-with-dependencies.jar %{_prefix}/lib/jars/flags-jar-with-dependencies.jar %{_prefix}/lib/jars/hk2-*.jar |