Merge pull request #8525 from vespa-engine/revert-8521-freva/do-not-depend-on-node-maintainer

Revert "Do not depend or build node-maintainer RPM"

2 files changed, 37 insertions, 0 deletions

diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec
index cf8ddf51553..569c5b3c0c0 100644
--- a/node-admin/vespa-node-admin.spec
+++ b/node-admin/vespa-node-admin.spec
@@ -18,6 +18,7 @@ URL:            http://vespa.ai
 Requires: bash
 Requires: vespa-base = %{version}
 Requires: vespa-standalone-container = %{version}
+Requires: vespa-node-maintainer = %{version}
 Requires: vespa-log-utils = %{version}
 
 Conflicts: vespa
diff --git a/node-maintainer/vespa-node-maintainer.spec b/node-maintainer/vespa-node-maintainer.spec
new file mode 100644
index 00000000000..f50d7708eef
--- /dev/null
+++ b/node-maintainer/vespa-node-maintainer.spec
@@ -0,0 +1,36 @@
+# 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
+
+# Hack to speed up jar packing for now. This does not affect the rpm size.
+%define __jar_repack %{nil}
+
+Name:           vespa-node-maintainer
+Version:        %version
+Release:        1%{?dist}
+BuildArch:      noarch
+Summary:        Vespa Node Maintainer
+Group:          Applications/Databases
+License:        Commercial
+URL:            http://vespa.ai
+
+Requires: bash
+Requires: vespa-base = %{version}
+
+Conflicts: vespa
+
+%description
+The Node Maintainer does various maintenance tasks on a node.
+
+
+%install
+mkdir -p %buildroot%_prefix/lib/jars
+cp node-maintainer/target/node-maintainer-jar-with-dependencies.jar %buildroot%_prefix/lib/jars
+
+%clean
+rm -rf %buildroot
+
+%files
+%defattr(-,vespa,vespa,-)
+%_prefix/*