fix spec files

5 files changed, 54 insertions, 5 deletions

diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec
index 1bb4bffc773..2528a016c11 100644
--- a/node-admin/vespa-node-admin.spec
+++ b/node-admin/vespa-node-admin.spec
@@ -17,6 +17,7 @@ URL:            http://vespa.ai
 
 Requires: bash
 Requires: java-1.8.0-openjdk-headless
+Requires: vespa-base
 Requires: vespa-standalone-container
 Requires: vespa-node-maintainer
 
diff --git a/node-maintainer/vespa-node-maintainer.spec b/node-maintainer/vespa-node-maintainer.spec
index d9b04f23b66..bf305552727 100644
--- a/node-maintainer/vespa-node-maintainer.spec
+++ b/node-maintainer/vespa-node-maintainer.spec
@@ -17,6 +17,7 @@ URL:            http://vespa.ai
 
 Requires: bash
 Requires: java-1.8.0-openjdk-headless
+Requires: vespa-base
 
 Conflicts: vespa
 
diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec
index d2140814d92..bd78f4e36a2 100644
--- a/standalone-container/vespa-standalone-container.spec
+++ b/standalone-container/vespa-standalone-container.spec
@@ -17,6 +17,7 @@ URL:            http://vespa.ai
 
 Requires: bash
 Requires: java-1.8.0-openjdk-headless
+Requires: vespa-base
 
 Conflicts: vespa
 
@@ -65,7 +66,6 @@ done
 cp vespajlib/target/vespajlib.jar "$jars_dir"
 
 declare -a libexec_files=(
-  vespabase/src/common-env.sh
   standalone-container/src/main/sh/standalone-container.sh
 )
 declare libexec_dir=%buildroot%_prefix/libexec/vespa
diff --git a/vespabase/vespa-base.spec b/vespabase/vespa-base.spec
new file mode 100644
index 00000000000..7299974d1b0
--- /dev/null
+++ b/vespabase/vespa-base.spec
@@ -0,0 +1,50 @@
+# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+# Force special prefix for Vespa
+%define _prefix /opt/vespa
+
+Name:           vespa-base
+Version:        %version
+Release:        1%{?dist}
+BuildArch:      noarch
+Summary:        Vespa common files
+Group:          Applications/Databases
+License:        Commercial
+URL:            http://vespa.ai
+
+Requires: bash
+
+Conflicts: vespa
+
+%description
+Common files for Vespa RPMs
+
+%install
+lev_dir=%?buildroot%_prefix/libexec/vespa
+mkdir -p "$lev_dir"
+cp vespabase/src/common-env.sh "${lev_dir}"
+chmod 444 "${lev_dir}/common-env.sh"
+
+%clean
+rm -rf %buildroot
+
+%pre
+getent group vespa >/dev/null || groupadd -r vespa
+getent passwd vespa >/dev/null || \
+    useradd -r -g vespa -d %{_prefix} -s /sbin/nologin \
+    -c "Create owner of all Vespa data files" vespa
+echo "pathmunge %{_prefix}/bin" > /etc/profile.d/vespa.sh
+echo "export VESPA_HOME=%{_prefix}" >> /etc/profile.d/vespa.sh
+chmod +x /etc/profile.d/vespa.sh
+exit 0
+
+%postun
+if [ $1 -eq 0 ]; then # this is an uninstallation
+    rm -f /etc/profile.d/vespa.sh
+    ! getent passwd vespa >/dev/null || userdel vespa
+    ! getent group vespa >/dev/null || groupdel vespa
+fi
+
+%files
+%defattr(-,vespa,vespa,-)
+%_prefix/*
diff --git a/vespalog/vespa-log-utils.spec b/vespalog/vespa-log-utils.spec
index b0298239c1b..d2a0fb81aad 100644
--- a/vespalog/vespa-log-utils.spec
+++ b/vespalog/vespa-log-utils.spec
@@ -13,6 +13,7 @@ License:        Commercial
 URL:            http://vespa.ai
 
 Requires: bash
+Requires: vespa-base
 
 Conflicts: vespa
 
@@ -21,12 +22,8 @@ Utilities for reading Vespa log files.
 
 %install
 bin_dir=%?buildroot%_prefix/bin
-lev_dir=%?buildroot%_prefix/libexec/vespa
 mkdir -p "$bin_dir"
-mkdir -p "$lev_dir"
-cp vespabase/src/common-env.sh "${lev_dir}"
 cp vespalog/src/vespa-logfmt/vespa-logfmt.pl "${bin_dir}/vespa-logfmt"
-chmod 444 "${lev_dir}/common-env.sh"
 chmod 555 "${bin_dir}/vespa-logfmt"
 ln -s "vespa-logfmt" "${bin_dir}/logfmt"