aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@yahooinc.com>2021-11-26 14:02:24 +0100
committerHåkon Hallingstad <hakon@yahooinc.com>2021-11-26 14:02:24 +0100
commit2060f0e6ba59dc95504337fe8f74bda61fbe8961 (patch)
treec49f0ff667e2ef9ddf2bf75cf0030d1ba46840b1 /dist
parent1c35df8be72d25ca71a8e4dcf49721a02caf8ef6 (diff)
Include vespa cli in vespa-clients RPM
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec11
1 files changed, 7 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 8620a26d945..999451314b8 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -6,6 +6,11 @@
# Only strip debug info
%global _find_debuginfo_opts -g
+# Go binaries' build-ids are not recognized by RPMs yet, see
+# https://github.com/rpm-software-management/rpm/issues/367 and
+# https://github.com/tpokorra/lbs-mono-fedora/issues/3#issuecomment-219857688.
+%undefine _missing_build_ids_terminate_build
+
# Force special prefix for Vespa
%define _prefix /opt/vespa
%define _vespa_deps_prefix /opt/vespa-deps
@@ -547,8 +552,7 @@ rm -rf %{buildroot}
cp -r %{installdir} %{buildroot}
%else
make install DESTDIR=%{buildroot}
-# TODO: Include the vespa program
-#cp client/go/bin/vespa %{buildroot}%{_prefix}/bin/vespa
+cp client/go/bin/vespa %{buildroot}%{_prefix}/bin/vespa
%endif
%if %{_create_vespa_service}
@@ -766,8 +770,7 @@ fi
%dir %{_prefix}/conf/vespa-feed-client
%dir %{_prefix}/lib
%dir %{_prefix}/lib/jars
-# TODO: Include the vespa program
-#%{_prefix}/bin/vespa
+%{_prefix}/bin/vespa
%{_prefix}/bin/vespa-feed-client
%{_prefix}/conf/vespa-feed-client/logging.properties
%{_prefix}/lib/jars/vespa-http-client-jar-with-dependencies.jar