From 4beabbe33d1e04d0f21ecdd3ff3ad4c50ca5d1c2 Mon Sep 17 00:00:00 2001 From: HÃ¥kon Hallingstad Date: Wed, 1 Dec 2021 11:41:11 +0100 Subject: Install manual pages in vespa-clients RPM --- dist/vespa.spec | 4 ++++ screwdriver.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dist/vespa.spec b/dist/vespa.spec index 1416109ab40..71bf69e4396 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -559,6 +559,8 @@ cp client/go/bin/vespa %{buildroot}%{_prefix}/bin/vespa %if 0%{?el7} strip %{buildroot}%{_prefix}/bin/vespa %endif +mkdir -p %{buildroot}/usr/share +cp -a client/go/share/* %{buildroot}/usr/share %if %{_create_vespa_service} mkdir -p %{buildroot}/usr/lib/systemd/system @@ -780,6 +782,8 @@ fi %{_prefix}/conf/vespa-feed-client/logging.properties %{_prefix}/lib/jars/vespa-http-client-jar-with-dependencies.jar %{_prefix}/lib/jars/vespa-feed-client-cli-jar-with-dependencies.jar +%docdir /usr/share/man +/usr/share/man %files config-model-fat %if %{_defattr_is_vespa_vespa} diff --git a/screwdriver.yaml b/screwdriver.yaml index 597f5f2678e..d5d7ae646b1 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -139,7 +139,7 @@ jobs: cd $WORKDIR/vespa export FACTORY_VESPA_VERSION=$VESPA_VERSION NUM_THREADS=$(( $(nproc) + 2 )) - time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin + time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin SHARE=$WORKDIR/vespa-install/usr/share time ./bootstrap.sh java time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS install cmake3 -DVESPA_UNPRIVILEGED=no . -- cgit v1.2.3