From 5785725ea5a601cf646d1aeabad104d802a38c08ec6276af7d2c284ff4b79136 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 23 Jun 2022 09:30:32 +0000 Subject: [PATCH] - Add conflict between cockpit-networkmanager and cockpit-wicked as they use the same URL paths. OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=99 --- cockpit.changes | 6 ++++++ cockpit.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/cockpit.changes b/cockpit.changes index 16b73d8..e64a6d9 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 23 09:27:17 UTC 2022 - Adam Majer + +- Add conflict between cockpit-networkmanager and cockpit-wicked + as they use the same URL paths. + ------------------------------------------------------------------- Mon Jun 20 08:15:34 UTC 2022 - Adam Majer diff --git a/cockpit.spec b/cockpit.spec index c5744ea..f2434bb 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -646,6 +646,7 @@ Summary: Cockpit user interface for networking, using NetworkManager Requires: cockpit-bridge >= 186 Requires: cockpit-shell >= 186 Requires: NetworkManager >= 1.6 +Conflicts: cockpit-wicked # Optional components Recommends: NetworkManager-team BuildArch: noarch