diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-02-18 10:41:24 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-02-18 10:41:24 +0100 |
commit | 72f190213b6ff840e076984a417126af83a0e16b (patch) | |
tree | f3485b45f14458c093ecf6e01f4551b05f952609 | |
parent | d15559afb0e5ba06bf9f33bd6f25ed02a90273a9 (diff) |
Revert "Revert "Do not depend or build node-maintainer RPM""
This reverts commit e277af41
-rw-r--r-- | node-admin/vespa-node-admin.spec | 1 | ||||
-rw-r--r-- | node-maintainer/vespa-node-maintainer.spec | 35 |
2 files changed, 0 insertions, 36 deletions
diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec index 569c5b3c0c0..cf8ddf51553 100644 --- a/node-admin/vespa-node-admin.spec +++ b/node-admin/vespa-node-admin.spec @@ -18,7 +18,6 @@ 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 index b1b31404a94..e69de29bb2d 100644 --- a/node-maintainer/vespa-node-maintainer.spec +++ b/node-maintainer/vespa-node-maintainer.spec @@ -1,35 +0,0 @@ -# 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 - -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/* |