aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index c9c81cf870a..5cc26e3eeb6 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -143,12 +143,13 @@ BuildRequires: gmock-devel
%if 0%{?el7} && 0%{?amzn2}
BuildRequires: vespa-xxhash-devel = 0.8.0
BuildRequires: vespa-openblas-devel = 0.3.12
+BuildRequires: vespa-re2-devel = 20190801
%else
BuildRequires: xxhash-devel >= 0.8.0
BuildRequires: openblas-devel
+BuildRequires: re2-devel
%endif
BuildRequires: zlib-devel
-BuildRequires: re2-devel
%if ! 0%{?el7}
BuildRequires: libicu-devel
%endif
@@ -204,7 +205,11 @@ Requires: openblas-serial
%endif
%endif
Requires: zlib
+%if 0%{?amzn2}
+Requires: vespa-re2 = 20190801
+%else
Requires: re2
+%endif
%if ! 0%{?el7}
Requires: libicu
%endif
@@ -721,8 +726,6 @@ fi
%{_prefix}/lib/jars/hk2-*.jar
%{_prefix}/lib/jars/hosted-zone-api-jar-with-dependencies.jar
%{_prefix}/lib/jars/jackson-*.jar
-%{_prefix}/lib/jars/jakarta.activation-api-*.jar
-%{_prefix}/lib/jars/jakarta.xml.bind-api-*.jar
%{_prefix}/lib/jars/javassist-*.jar
%{_prefix}/lib/jars/javax.*.jar
%{_prefix}/lib/jars/jdisc-cloud-aws-jar-with-dependencies.jar