From f46d44d3f30739fd54110bf993c8d62b59f5faff5fc486bb4a794f70270fa4db Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 5 Mar 2024 08:08:08 +0000 Subject: [PATCH] Add Provides/Obsoletes to replace plasma 5 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-nm?expand=0&rev=4 --- plasma6-nm.changes | 5 ++++ plasma6-nm.spec | 63 ++++++++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/plasma6-nm.changes b/plasma6-nm.changes index 2ff3884..b63be16 100644 --- a/plasma6-nm.changes +++ b/plasma6-nm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 4 20:35:45 UTC 2024 - Christophe Marin + +- Add Provides/Obsoletes to replace Plasma 5 + ------------------------------------------------------------------- Tue Feb 27 19:04:25 UTC 2024 - Fabian Vogt diff --git a/plasma6-nm.spec b/plasma6-nm.spec index 5235592..a453f27 100644 --- a/plasma6-nm.spec +++ b/plasma6-nm.spec @@ -89,8 +89,10 @@ Requires: kf6-prison-imports >= %{kf6_version} Requires: kwalletd6 Recommends: mobile-broadband-provider-info Supplements: (plasma6-desktop and NetworkManager) -Conflicts: plasma-nm-kf5 -Conflicts: plasma-nm5 +Provides: plasma-nm-kf5 = %{version} +Obsoletes: plasma-nm-kf5 < %{version} +Provides: plasma-nm5 = %{version} +Obsoletes: plasma-nm5 < %{version} Provides: NetworkManager-client %description @@ -103,10 +105,13 @@ Requires: plasma6-nm = %{version} Requires: NetworkManager-openvpn Supplements: (plasma6-nm and NetworkManager-openvpn) Provides: NetworkManager-openvpn-frontend -Conflicts: plasma-nm5-openvpn +Provides: plasma-nm5-openvpn = %{version} +Obsoletes: plasma-nm5-openvpn < %{version} # Old names provided / Obsoleted by plasma-nm5 -Conflicts: plasma-nm-openvpn -Conflicts: NetworkManager-openvpn-kde4 +Provides: plasma-nm-openvpn = %{version} +Obsoletes: plasma-nm-openvpn < %{version} +Provides: NetworkManager-openvpn-kde4 = %{version} +Obsoletes: NetworkManager-openvpn-kde4 < %{version} %description openvpn OpenVPN plugin for plasma-nm components. @@ -117,10 +122,13 @@ Requires: plasma6-nm = %{version} Requires: NetworkManager-vpnc Supplements: (plasma6-nm and NetworkManager-vpnc) Provides: NetworkManager-vpnc-frontend -Conflicts: plasma-nm5-vpnc +Provides: plasma-nm5-vpnc = %{version} +Obsoletes: plasma-nm5-vpnc < %{version} # Old names provided / Obsoleted by plasma-nm5 -Conflicts: plasma-nm-vpnc -Conflicts: NetworkManager-vpnc-kde4 +Provides: plasma-nm-vpnc = %{version} +Obsoletes: plasma-nm-vpnc < %{version} +Provides: NetworkManager-vpnc-kde4 = %{version} +Obsoletes: NetworkManager-vpnc-kde4 < %{version} %description vpnc vpnc plugin for plasma-nm components. @@ -133,10 +141,13 @@ Requires: NetworkManager-openconnect Requires: openconnect Supplements: (plasma6-nm and NetworkManager-openconnect) Provides: NetworkManager-openconnect-frontend -Conflicts: plasma-nm5-openconnect +Provides: plasma-nm5-openconnect = %{version} +Obsoletes: plasma-nm5-openconnect < %{version} # Old names provided / Obsoleted by plasma-nm5 -Conflicts: plasma-nm-openconnect -Conflicts: NetworkManager-openconnect-kde4 +Provides: plasma-nm-openconnect = %{version} +Obsoletes: plasma-nm-openconnect < %{version} +Provides: NetworkManager-openconnect-kde4 = %{version} +Obsoletes: NetworkManager-openconnect-kde4 < %{version} %description openconnect OpenConnect plugin for plasma-nm components. @@ -148,9 +159,11 @@ Requires: plasma6-nm = %{version} Requires: NetworkManager-libreswan Supplements: (plasma6-nm and NetworkManager-libreswan) Provides: NetworkManager-libreswan-frontend -Conflicts: plasma-nm5-openswan +Provides: plasma-nm5-openswan = %{version} +Obsoletes: plasma-nm5-openswan < %{version} # Old names provided / Obsoleted by plasma-nm5 -Conflicts: plasma-nm-openswan +Provides: plasma-nm-openswan = %{version} +Obsoletes: plasma-nm-openswan < %{version} %description libreswan Libreswan plugin for plasma-nm components. @@ -161,9 +174,11 @@ Requires: plasma6-nm = %{version} Requires: NetworkManager-strongswan Supplements: (plasma6-nm and NetworkManager-strongswan) Provides: NetworkManager-strongswan-frontend -Conflicts: plasma-nm5-strongswan +Provides: plasma-nm5-strongswan = %{version} +Obsoletes: plasma-nm5-strongswan < %{version} # Old names provided / Obsoleted by plasma-nm5 -Conflicts: plasma-nm-strongswan +Provides: plasma-nm-strongswan = %{version} +Obsoletes: plasma-nm-strongswan < %{version} %description strongswan strongSwan plugin for plasma-nm components. @@ -174,9 +189,11 @@ Requires: plasma6-nm = %{version} Requires: NetworkManager-l2tp Supplements: (plasma6-nm and NetworkManager-l2tp) Provides: NetworkManager-l2tp-frontend -Conflicts: plasma-nm5-l2tp +Provides: plasma-nm5-l2tp = %{version} +Obsoletes: plasma-nm5-l2tp < %{version} # Old names provided / Obsoleted by plasma-nm5 -Conflicts: plasma-nm-l2tp +Provides: plasma-nm-l2tp = %{version} +Obsoletes: plasma-nm-l2tp < %{version} %description l2tp Layer Two Tunneling Protocol (L2TP) plugin for plasma-nm components. @@ -187,10 +204,13 @@ Requires: plasma6-nm = %{version} Requires: NetworkManager-pptp Supplements: (plasma6-nm and NetworkManager-pptp) Provides: NetworkManager-pptp-frontend -Conflicts: plasma-nm5-pptp +Provides: plasma-nm5-pptp = %{version} +Obsoletes: plasma-nm5-pptp < %{version} # Old names provided / Obsoleted by plasma-nm5 -Conflicts: plasma-nm-pptp -Conflicts: NetworkManager-pptp-kde4 +Provides: plasma-nm-pptp = %{version} +Obsoletes: plasma-nm-pptp < %{version} +Provides: NetworkManager-pptp-kde4 = %{version} +Obsoletes: NetworkManager-pptp-kde4 < %{version} %description pptp Point-To-Point Tunneling Protocol (PPTP) plugin for plasma-nm components. @@ -202,7 +222,8 @@ Requires: plasma6-nm = %{version} #Requires: NetworkManager-ssh Supplements: (plasma6-nm and NetworkManager-ssh) Provides: NetworkManager-ssh-frontend -Conflicts: plasma-nm5-ssh +Provides: plasma-nm5-ssh = %{version} +Obsoletes: plasma-nm5-ssh < %{version} %description ssh Secure Shell (SSH) plugin for plasma-nm components.