diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2018-05-16 06:51:32 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2018-05-16 07:32:22 +0000 |
| commit | 29ae26cc5efd5aaed408225145f756a8f44a5f47 (patch) | |
| tree | a099c8ed59eb066d47ac164025d6c612091c5266 | |
| parent | a51021d1a2e737deefde42777e58d8e364af91ad (diff) | |
packaging vespalib into RPM did not work
| -rw-r--r-- | node-admin/vespa-node-admin.spec | 1 | ||||
| -rw-r--r-- | node-maintainer/vespa-node-maintainer.spec | 1 | ||||
| -rw-r--r-- | standalone-container/vespa-standalone-container.spec | 1 | ||||
| -rw-r--r-- | vespalib/vespa-lib.spec | 38 |
4 files changed, 0 insertions, 41 deletions
diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec index f63f4b628e3..ef5ab4ef315 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: java-1.8.0-openjdk-headless Requires: vespa-base = %{version} -Requires: vespa-lib = %{version} Requires: vespa-standalone-container = %{version} Requires: vespa-node-maintainer = %{version} Requires: vespa-log-utils = %{version} diff --git a/node-maintainer/vespa-node-maintainer.spec b/node-maintainer/vespa-node-maintainer.spec index 2746428f017..7b5311f1337 100644 --- a/node-maintainer/vespa-node-maintainer.spec +++ b/node-maintainer/vespa-node-maintainer.spec @@ -18,7 +18,6 @@ URL: http://vespa.ai Requires: bash Requires: java-1.8.0-openjdk-headless Requires: vespa-base = %{version} -Requires: vespa-lib = %{version} Conflicts: vespa diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec index b4ce4db83a1..05a126e49b3 100644 --- a/standalone-container/vespa-standalone-container.spec +++ b/standalone-container/vespa-standalone-container.spec @@ -18,7 +18,6 @@ URL: http://vespa.ai Requires: bash Requires: java-1.8.0-openjdk-headless Requires: vespa-base = %{version} -Requires: vespa-lib = %{version} Conflicts: vespa diff --git a/vespalib/vespa-lib.spec b/vespalib/vespa-lib.spec deleted file mode 100644 index 632b5110ed1..00000000000 --- a/vespalib/vespa-lib.spec +++ /dev/null @@ -1,38 +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 - -Name: vespa-lib -Version: %version -Release: 1%{?dist} -BuildArch: x86_64 -Summary: Vespa common libraries -Group: Applications/Databases -License: Commercial -URL: http://vespa.ai - -Requires: bash - -Conflicts: vespa - -%description -Common libraries and binaries for Vespa RPMs - -%install -bin_dir=%?buildroot%_prefix/bin -lib_dir=%?buildroot%_prefix/lib -mkdir -p "$bin_dir" -mkdir -p "$lib_dir" -cp vespalib/src/apps/vespa-detect-hostname/vespa-detect-hostname "${bin_dir}" -cp vespalib/src/apps/vespa-validate-hostname/vespa-validate-hostname "${bin_dir}" -cp fastos/src/vespa/fastos/libfastos.so "${lib_dir}" -cp vespalog/src/vespa/log/libvespalog.so "${lib_dir}" -cp vespalib/src/vespa/vespalib/libvespalib.so "${lib_dir}" - -%clean -rm -rf %buildroot - -%files -%defattr(-,vespa,vespa,-) -%_prefix/* |