summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2020-03-18 13:39:56 +0100
committerGitHub <noreply@github.com>2020-03-18 13:39:56 +0100
commitdbbadd69f2ff429e861f0f6d055a5bf4b0883270 (patch)
tree379ee742b5fe5f9da77817fb1c9a247440a36ca4
parent1e7ebae137d6538c466ef4148d080db356746f90 (diff)
Revert "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, 4 insertions, 8 deletions
diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec
index 01fedd19fb3..cf8ddf51553 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: x86_64
+BuildArch: noarch
Summary: Vespa Node Admin
Group: Applications/Databases
License: Commercial
@@ -19,7 +19,6 @@ 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 03e9d5c4a86..478302728f3 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: x86_64
+BuildArch: noarch
Release: 1%{?dist}
Summary: Vespa standalone JDisc container
Group: Applications/Databases
@@ -17,7 +17,6 @@ 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 486b5d17a93..7299974d1b0 100644
--- a/vespabase/vespa-base.spec
+++ b/vespabase/vespa-base.spec
@@ -6,14 +6,13 @@
Name: vespa-base
Version: %version
Release: 1%{?dist}
-BuildArch: x86_64
+BuildArch: noarch
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 65096853fbf..8c7ca7f1cdd 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: x86_64
+BuildArch: noarch
Summary: Vespa log utilities
Group: Applications/Databases
License: Commercial
@@ -14,7 +14,6 @@ URL: http://vespa.ai
Requires: bash
Requires: vespa-base = %{version}
-Obsoletes: vespa-log-utils < %{version}
Conflicts: vespa