aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2020-03-18 09:10:06 +0100
committerHåkon Hallingstad <hakon@verizonmedia.com>2020-03-18 09:10:06 +0100
commit9f4fcc6fefb414d6ec8e66694c51a55aed8d1540 (patch)
tree4dbffc5bc7ca8d3e9eb54ae331841f8c058065ed
parent97b872cc2808771350062e223cdac0e45fcb380a (diff)
Move RPMs to x86_64 with Obsoletes
-rw-r--r--node-admin/vespa-node-admin.spec3
-rw-r--r--standalone-container/vespa-standalone-container.spec3
-rw-r--r--vespabase/vespa-base.spec3
-rw-r--r--vespalog/vespa-log-utils.spec3
4 files changed, 8 insertions, 4 deletions
diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec
index cf8ddf51553..01fedd19fb3 100644
--- a/node-admin/vespa-node-admin.spec
+++ b/node-admin/vespa-node-admin.spec
@@ -9,7 +9,7 @@
Name: vespa-node-admin
Version: %version
Release: 1%{?dist}
-BuildArch: noarch
+BuildArch: x86_64
Summary: Vespa Node Admin
Group: Applications/Databases
License: Commercial
@@ -19,6 +19,7 @@ Requires: bash
Requires: vespa-base = %{version}
Requires: vespa-standalone-container = %{version}
Requires: vespa-log-utils = %{version}
+Obsoletes: vespa-node-admin < %{version}
Conflicts: vespa
diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec
index 478302728f3..03e9d5c4a86 100644
--- a/standalone-container/vespa-standalone-container.spec
+++ b/standalone-container/vespa-standalone-container.spec
@@ -8,7 +8,7 @@
Name: vespa-standalone-container
Version: %version
-BuildArch: noarch
+BuildArch: x86_64
Release: 1%{?dist}
Summary: Vespa standalone JDisc container
Group: Applications/Databases
@@ -17,6 +17,7 @@ URL: http://vespa.ai
Requires: bash
Requires: vespa-base = %{version}
+Obsoletes: vespa-standalone-container < %{version}
Conflicts: vespa
diff --git a/vespabase/vespa-base.spec b/vespabase/vespa-base.spec
index 7299974d1b0..486b5d17a93 100644
--- a/vespabase/vespa-base.spec
+++ b/vespabase/vespa-base.spec
@@ -6,13 +6,14 @@
Name: vespa-base
Version: %version
Release: 1%{?dist}
-BuildArch: noarch
+BuildArch: x86_64
Summary: Vespa common files
Group: Applications/Databases
License: Commercial
URL: http://vespa.ai
Requires: bash
+Obsoletes: vespa-base < %version
Conflicts: vespa
diff --git a/vespalog/vespa-log-utils.spec b/vespalog/vespa-log-utils.spec
index 8c7ca7f1cdd..65096853fbf 100644
--- a/vespalog/vespa-log-utils.spec
+++ b/vespalog/vespa-log-utils.spec
@@ -6,7 +6,7 @@
Name: vespa-log-utils
Version: %version
Release: 1%{?dist}
-BuildArch: noarch
+BuildArch: x86_64
Summary: Vespa log utilities
Group: Applications/Databases
License: Commercial
@@ -14,6 +14,7 @@ URL: http://vespa.ai
Requires: bash
Requires: vespa-base = %{version}
+Obsoletes: vespa-log-utils < %{version}
Conflicts: vespa