From 4beabbe33d1e04d0f21ecdd3ff3ad4c50ca5d1c2 Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@yahooinc.com>
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


From 2196529fdefa88bb1fdc6d676b9045d69c5373aa Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@yahooinc.com>
Date: Wed, 1 Dec 2021 12:18:17 +0100
Subject: Avoid copying unless just built

---
 dist/vespa.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/vespa.spec b/dist/vespa.spec
index 71bf69e4396..d872a43eb3e 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -553,14 +553,14 @@ cp -r %{installdir} %{buildroot}
 %else
 make install DESTDIR=%{buildroot}
 cp client/go/bin/vespa %{buildroot}%{_prefix}/bin/vespa
+mkdir -p %{buildroot}/usr/share
+cp -a client/go/share/* %{buildroot}/usr/share
 %endif
 # Otherwise installation may fail for find-debuginfo.sh/dwz:
 # dwz: dwz.c:9899: read_dwarf: Assertion `data != ((void *)0) && data->d_buf != ((void *)0)' failed.
 %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
-- 
cgit v1.2.3


From f2bead5bf5e5fc7ea1e76ada2725bd21a30eb188 Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@yahooinc.com>
Date: Wed, 1 Dec 2021 13:08:54 +0100
Subject: Also install manpages

---
 client/go/Makefile         | 2 ++
 dist/vespa.spec            | 2 +-
 screwdriver.yaml           | 2 +-
 screwdriver/build-vespa.sh | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/go/Makefile b/client/go/Makefile
index 58d15e9c139..bc4a60f61db 100644
--- a/client/go/Makefile
+++ b/client/go/Makefile
@@ -99,6 +99,8 @@ ifeq ($(VERSION),$(DEVEL_VERSION))
 	$(error Invalid release version: $(VERSION). Try 'git checkout vX.Y.Z' or 'env VERSION=X.Y.Z make ...')
 endif
 
+install-all: all manpages
+
 #
 # Development targets
 #
diff --git a/dist/vespa.spec b/dist/vespa.spec
index d872a43eb3e..3c96c6b0ce1 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -542,7 +542,7 @@ mvn --batch-mode -e -N io.takari:maven:wrapper -Dmaven=3.6.3
        .
 
 make %{_smp_mflags}
-VERSION=%{version} make -C client/go
+VERSION=%{version} make -C client/go install-all
 %endif
 
 %install
diff --git a/screwdriver.yaml b/screwdriver.yaml
index d5d7ae646b1..6ea74ae8a1d 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 SHARE=$WORKDIR/vespa-install/usr/share
+          time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin SHARE=$WORKDIR/vespa-install/usr/share install-all
           time ./bootstrap.sh java
           time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS install
           cmake3 -DVESPA_UNPRIVILEGED=no .
diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh
index 714f4972e12..f321e3820fd 100755
--- a/screwdriver/build-vespa.sh
+++ b/screwdriver/build-vespa.sh
@@ -40,10 +40,10 @@ case $SHOULD_BUILD in
     mvn -V $VESPA_MAVEN_EXTRA_OPTS install
     ;;
   go)
-    make -C client/go
+    make -C client/go install-all
     ;;
   *)
-    make -C client/go
+    make -C client/go install-all
     ./bootstrap.sh java
     time mvn -V $VESPA_MAVEN_EXTRA_OPTS install
     cmake3 -DVESPA_UNPRIVILEGED=no .
-- 
cgit v1.2.3