|
 |
f2124f |
From 2ab6a1716eca40c1a1c16aa1ac5457959b54fb82 Mon Sep 17 00:00:00 2001
|
|
|
f2124f |
From: Stef Walter <stefw@redhat.com>
|
|
|
f2124f |
Date: Thu, 14 Jul 2016 10:25:36 +0200
|
|
|
f2124f |
Subject: [PATCH 2/2] tools: Update packaging files for stable 0.114 release
|
|
|
f2124f |
|
|
|
f2124f |
The internal javascript API in 0.114 is considered stable
|
|
|
f2124f |
in the base1 package. So subpackages can use any version of
|
|
|
f2124f |
cockpit-bridge and cockpit-shell 0.114 or later.
|
|
|
f2124f |
|
|
|
f2124f |
Closes #4736
|
|
|
f2124f |
Reviewed-by: Peter <petervo@redhat.com>
|
|
|
f2124f |
---
|
|
|
f2124f |
tools/cockpit.spec | 33 +++++++++++++++++++++++----------
|
|
|
f2124f |
1 file changed, 23 insertions(+), 10 deletions(-)
|
|
|
f2124f |
|
|
|
f2124f |
diff --git a/tools/cockpit.spec b/tools/cockpit.spec
|
|
|
f2124f |
index 5a0ad60..655cf8a 100644
|
|
|
f2124f |
--- a/tools/cockpit.spec
|
|
|
f2124f |
+++ b/tools/cockpit.spec
|
|
|
f2124f |
@@ -16,6 +16,10 @@
|
|
|
f2124f |
|
|
|
f2124f |
%if %{defined gitcommit}
|
|
|
f2124f |
%define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC -g -DWITH_DEBUG'
|
|
|
f2124f |
+%define stable_api %{gitcommit}
|
|
|
f2124f |
+%else
|
|
|
f2124f |
+# The first version with a stable APIs
|
|
|
f2124f |
+%define stable_api 0.114
|
|
|
f2124f |
%endif
|
|
|
f2124f |
|
|
|
f2124f |
%if 0%{?centos}
|
|
|
f2124f |
@@ -344,7 +348,7 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
|
|
|
f2124f |
|
|
|
f2124f |
%package shell
|
|
|
f2124f |
Summary: Cockpit Shell user interface package
|
|
|
f2124f |
-Requires: %{name}-bridge = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
Requires: shadow-utils
|
|
|
f2124f |
Requires: grep
|
|
|
f2124f |
Requires: libpwquality
|
|
|
f2124f |
@@ -366,7 +370,8 @@ This package contains the Cockpit shell UI assets.
|
|
|
f2124f |
|
|
|
f2124f |
%package storaged
|
|
|
f2124f |
Summary: Cockpit user interface for storage, using Storaged
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
Requires: storaged >= 2.1.1
|
|
|
f2124f |
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
|
|
|
f2124f |
Recommends: storaged-lvm2 >= 2.1.1
|
|
|
f2124f |
@@ -386,7 +391,8 @@ The Cockpit component for managing storage. This package uses Storaged.
|
|
|
f2124f |
|
|
|
f2124f |
%package ostree
|
|
|
f2124f |
Summary: Cockpit user interface for rpm-ostree
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
%if 0%{?fedora} > 0 && 0%{?fedora} < 24
|
|
|
f2124f |
Requires: rpm-ostree >= 2015.10-1
|
|
|
f2124f |
%else
|
|
|
f2124f |
@@ -404,7 +410,8 @@ The Cockpit components for managing software updates for ostree based systems.
|
|
|
f2124f |
|
|
|
f2124f |
%package sosreport
|
|
|
f2124f |
Summary: Cockpit user interface for diagnostic reports
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
Requires: sos
|
|
|
f2124f |
BuildArch: noarch
|
|
|
f2124f |
|
|
|
f2124f |
@@ -416,7 +423,8 @@ sosreport tool.
|
|
|
f2124f |
|
|
|
f2124f |
%package subscriptions
|
|
|
f2124f |
Summary: Cockpit subscription user interface package
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
Requires: subscription-manager >= 1.13
|
|
|
f2124f |
BuildArch: noarch
|
|
|
f2124f |
|
|
|
f2124f |
@@ -428,7 +436,8 @@ subscription management.
|
|
|
f2124f |
|
|
|
f2124f |
%package networkmanager
|
|
|
f2124f |
Summary: Cockpit user interface for networking, using NetworkManager
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
Requires: NetworkManager
|
|
|
f2124f |
BuildArch: noarch
|
|
|
f2124f |
|
|
|
f2124f |
@@ -443,7 +452,8 @@ The Cockpit component for managing networking. This package uses NetworkManager
|
|
|
f2124f |
|
|
|
f2124f |
%package selinux
|
|
|
f2124f |
Summary: Cockpit SELinux package
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
Requires: setroubleshoot-server >= 3.3.3
|
|
|
f2124f |
BuildArch: noarch
|
|
|
f2124f |
|
|
|
f2124f |
@@ -459,7 +469,8 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
|
|
|
f2124f |
|
|
|
f2124f |
%package docker
|
|
|
f2124f |
Summary: Cockpit user interface for Docker containers
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
Requires: docker >= 1.3.0
|
|
|
f2124f |
|
|
|
f2124f |
%description docker
|
|
|
f2124f |
@@ -475,7 +486,8 @@ This package is not yet complete.
|
|
|
f2124f |
%package kubernetes
|
|
|
f2124f |
Summary: Cockpit user interface for Kubernetes cluster
|
|
|
f2124f |
Requires: /usr/bin/kubectl
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
BuildRequires: golang-bin
|
|
|
f2124f |
BuildRequires: golang-src
|
|
|
f2124f |
|
|
|
f2124f |
@@ -493,7 +505,8 @@ cluster. Installed on the Kubernetes master. This package is not yet complete.
|
|
|
f2124f |
|
|
|
f2124f |
%package test-assets
|
|
|
f2124f |
Summary: Additional stuff for testing Cockpit
|
|
|
f2124f |
-Requires: %{name}-shell = %{version}-%{release}
|
|
|
f2124f |
+Requires: %{name}-bridge >= %{stable_api}
|
|
|
f2124f |
+Requires: %{name}-shell >= %{stable_api}
|
|
|
f2124f |
Requires: openssh-clients
|
|
|
f2124f |
|
|
|
f2124f |
%description test-assets
|
|
|
f2124f |
--
|
|
|
f2124f |
1.8.3.1
|
|
|
f2124f |
|